Skip to content

Commit

Permalink
Try to fix dependency issues
Browse files Browse the repository at this point in the history
  • Loading branch information
slesaad committed Jul 25, 2024
1 parent 224de7b commit 35efc69
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion common/auth/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from setuptools import find_packages, setup

inst_reqs = ["cryptography>=42.0.5", "pyjwt>=2.8.0", "fastapi<=0.108.0", "pydantic<2"]
inst_reqs = ["cryptography>=42.0.5", "pyjwt>=2.8.0", "fastapi", "pydantic<2"]

setup(
name="veda_auth",
Expand Down
8 changes: 4 additions & 4 deletions ingest_api/runtime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ FROM public.ecr.aws/sam/build-python3.9:latest

WORKDIR /tmp

COPY common/auth /tmp/common/auth
RUN pip install /tmp/common/auth -t /asset
RUN rm -rf /tmp/common

COPY ingest_api/runtime/requirements.txt /tmp/ingestor/requirements.txt
RUN pip install -r /tmp/ingestor/requirements.txt -t /asset --no-binary pydantic uvicorn
RUN rm -rf /tmp/ingestor
# TODO this is temporary until we use a real packaging system like setup.py or poetry
COPY ingest_api/runtime/src /asset/src

COPY common/auth /tmp/common/auth
RUN pip install /tmp/common/auth -t /asset
RUN rm -rf /tmp/common

# # Reduce package size and remove useless files
RUN cd /asset && find . -type f -name '*.pyc' | while read f; do n=$(echo $f | sed 's/__pycache__\///' | sed 's/.cpython-[2-3][0-9]//'); cp $f $n; done;
RUN cd /asset && find . -type d -a -name '__pycache__' -print0 | xargs -0 rm -rf
Expand Down
3 changes: 2 additions & 1 deletion stac_api/runtime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ WORKDIR /tmp
COPY stac_api/runtime /tmp/stac
COPY common/auth /tmp/stac/common/auth
RUN pip install /tmp/stac/common/auth -t /asset
RUN pip install "mangum>=0.14,<0.15" "plpygis>=0.2.1" /tmp/stac "pydantic<2" -t /asset --no-binary pydantic

RUN pip install "mangum>=0.14,<0.15" "plpygis>=0.2.1" /tmp/stac -t /asset --no-binary pydantic
RUN rm -rf /tmp/stac

# Reduce package size and remove useless files
Expand Down
Empty file.

0 comments on commit 35efc69

Please sign in to comment.