Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround setuptools 72 removing test command #3304

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Workaround setuptools 72 removing test command #3304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boefjes/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ RUN --mount=type=cache,target=/root/.cache \
pip install --upgrade pip \
&& if [ "$ENVIRONMENT" = "dev" ]; \
then \
grep -v git+https:// requirements-dev.txt | pip install -r /dev/stdin ; \
grep -v git+https:// requirements-dev.txt | pip install -r /dev/stdin && \
grep git+https:// requirements-dev.txt | pip install -r /dev/stdin ; \
else \
grep -v git+https:// requirements.txt | pip install -r /dev/stdin ;\
grep -v git+https:// requirements.txt | pip install -r /dev/stdin && \
grep git+https:// requirements.txt | pip install -r /dev/stdin ; \
fi

Expand Down
12 changes: 8 additions & 4 deletions rocky/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,19 @@ ARG ENVIRONMENT
# requirements separately
COPY rocky/requirements*.txt .
RUN --mount=type=cache,target=/root/.cache \
pip install --upgrade pip \
# Workaround for https://github.com/pypa/setuptools/issues/4519 \
echo "setuptools<72" > /tmp/constraints.txt \
&& export PIP_CONSTRAINT=/tmp/constraints.txt \
&& pip install --upgrade pip \
&& if [ "$ENVIRONMENT" = "dev" ]; \
then \
grep -v git+https:// requirements-dev.txt | pip install -r /dev/stdin ; \
grep -v git+https:// requirements-dev.txt | pip install -r /dev/stdin && \
grep git+https:// requirements-dev.txt | pip install -r /dev/stdin ; \
else \
grep -v git+https:// requirements.txt | pip install -r /dev/stdin ;\
grep -v git+https:// requirements.txt | pip install -r /dev/stdin && \
grep git+https:// requirements.txt | pip install -r /dev/stdin ; \
fi
fi \
&& rm /tmp/constraints.txt

FROM dev

Expand Down