Skip to content

Commit

Permalink
fix: use setuptools in tox instead of base.in
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Jul 31, 2024
1 parent e79646d commit 4da5111
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 29 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/base.txt requirements/base.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/test.txt requirements/test.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/doc.txt requirements/doc.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/production.txt requirements/production.in
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade -o requirements/production.txt requirements/production.in
# Let tox control the Django version for tests
grep -e "^django==" requirements/production.txt > requirements/django.txt
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
Expand Down
3 changes: 1 addition & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -272,5 +272,4 @@ zipp==3.19.2
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
# via -r requirements/base.in
# setuptools
4 changes: 0 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,3 @@ zipp==3.19.2
# via
# -r requirements/quality.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
# via -r requirements/quality.txt
4 changes: 0 additions & 4 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,3 @@ zipp==3.19.2
# via
# -r requirements/test.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
# via -r requirements/test.txt
6 changes: 1 addition & 5 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,4 @@ zope-interface==6.4.post2
# via gevent

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
# via
# -r requirements/base.txt
# zope-event
# zope-interface
# setuptools
4 changes: 0 additions & 4 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,3 @@ zipp==3.19.2
# via
# -r requirements/test.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
# via -r requirements/test.txt
4 changes: 0 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,3 @@ zipp==3.19.2
# via
# -r requirements/base.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==72.1.0
# via -r requirements/base.txt
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ testpaths = designer/apps

[testenv]
deps =
setuptools
django42: -r requirements/django.txt
-r {toxinidir}/requirements/test.txt
commands =
Expand All @@ -17,6 +18,7 @@ commands =
allowlist_externals =
make
deps =
setuptools
-r{toxinidir}/requirements/dev.txt
commands =
make quality
Expand All @@ -25,6 +27,7 @@ commands =
allowlist_externals =
make
deps =
setuptools
-r{toxinidir}/requirements/dev.txt
commands =
make pii_check
Expand All @@ -33,6 +36,7 @@ commands =
allowlist_externals =
make
deps =
setuptools
-r{toxinidir}/requirements/dev.txt
commands =
make check_keywords

0 comments on commit 4da5111

Please sign in to comment.