Skip to content

Commit

Permalink
build: Explicitly install setuptools in ci.txt
Browse files Browse the repository at this point in the history
We need setuptools to run tox but it doesn't get install by default in
python environmnets starting with Python 3.12 so explicitly install it
when setting up the CI enviromnent.
  • Loading branch information
feanil committed Apr 23, 2024
1 parent 6d7108b commit 8942d80
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ upgrade: requirements check_pins ## update the requirements/*.txt files with the
$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/doc.txt requirements/doc.in
$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/test.txt requirements/test.in
$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/dev.txt requirements/dev.in
$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url --allow-unsafe -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/js_test.txt requirements/js_test.in
# This section removes django from test.txt to
# let tox control the Django version for tests
Expand Down
1 change: 1 addition & 0 deletions requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
-c constraints.txt

tox # Virtualenv management for tests
setuptools
4 changes: 4 additions & 0 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ tox==3.28.0
# -r requirements/ci.in
virtualenv==20.25.3
# via tox

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.5.1
# via -r requirements/ci.in

0 comments on commit 8942d80

Please sign in to comment.