Skip to content

Commit

Permalink
fix: skip including setuptools in requirements directly
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Mar 6, 2024
1 parent 95c0300 commit 2900b0c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 25 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.txt
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --allow-unsafe --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
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 --allow-unsafe --rebuild --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/doc.txt requirements/base.in requirements/doc.in
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in
pip-compile --rebuild --upgrade -o requirements/doc.txt requirements/base.in requirements/doc.in
pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --rebuild --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
pip-compile --rebuild --upgrade -o requirements/ci.txt requirements/ci.in
# Let tox control the Django version for tests
sed '/^django==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt
Expand Down
11 changes: 3 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ path==16.10.0
# via edx-i18n-tools
pbr==6.0.0
# via stevedore
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/dev.in
pkginfo==1.10.0
# via twine
Expand Down Expand Up @@ -231,10 +231,5 @@ zipp==3.17.0
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via pip-tools
setuptools==69.1.1
# via
# -r requirements/base.in
# -r requirements/dev.in
# pip-tools
# pip
# setuptools
5 changes: 1 addition & 4 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,4 @@ zipp==3.17.0
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via
# -r requirements/base.in
# -r requirements/doc.in
# setuptools
8 changes: 3 additions & 5 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ importlib-metadata==7.0.1
# via build
packaging==23.2
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
Expand All @@ -29,7 +29,5 @@ zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via pip-tools
setuptools==69.1.1
# via pip-tools
# pip
# setuptools
3 changes: 1 addition & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,4 @@ zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.in
# setuptools
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ envlist = py{38, 312}-django{42}, docs, quality

[testenv]
deps =
setuptools
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =
Expand All @@ -16,6 +17,8 @@ allowlist_externals =
make
rm
deps =
setuptools
wheel
-r{toxinidir}/requirements/test.txt
-r{toxinidir}/requirements/doc.txt
commands =
Expand All @@ -30,6 +33,7 @@ setenv =
DJANGO_SETTINGS_MODULE=test_settings
PYTHONPATH = {toxinidir}/:{toxinidir}/edx_ace
deps =
setuptools
quality: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
-r{toxinidir}/requirements/quality.txt
Expand Down

0 comments on commit 2900b0c

Please sign in to comment.