Skip to content

Commit

Permalink
Repair the all option for extras_require and add it to the Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
cuttlefish committed Jul 26, 2021
1 parent 6dd7b64 commit a91cdee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN apt-get update \
COPY pyproject.toml setup.cfg ./
COPY src/stactools/core/__init__.py src/stactools/core/
# Install dependencies but remove the actual package
RUN pip install --prefix=/install . \
RUN pip install --prefix=/install .[all] \
&& rm -r /install/lib/*/site-packages/stactools*


Expand All @@ -31,11 +31,11 @@ RUN conda install -c conda-forge pandoc && conda clean -af
COPY requirements-dev.txt ./
RUN pip install -r requirements-dev.txt
COPY . ./
RUN pip install -e .
RUN pip install -e .[all]


FROM base AS main
COPY --from=dep_builder /install /opt/conda
COPY src ./src
COPY pyproject.toml setup.cfg ./
RUN pip install .
RUN pip install .[all]
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ install_requires =
lxml ~= 4.6

[options.extras_require]
all = s3
s3 = s3fs ~= 2021.7
all =
%(s3)s
s3 =
s3fs ~= 2021.7

[options.packages.find]
where = src
Expand Down

0 comments on commit a91cdee

Please sign in to comment.