Skip to content

Commit

Permalink
fix: include setuptools in requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Feb 26, 2024
1 parent 36122a4 commit 04d5d9e
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 235 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ docs: ## generate Sphinx HTML documentation, including API docs
$(BROWSER)docs/_build/html/index.html

# Define CMD_PIP_COMPILE_OPTS=-v to get more information during make upgrade.
CMD_PIP_COMPILE ?= pip-compile --rebuild --upgrade $(CMD_PIP_COMPILE_OPTS)
CMD_PIP_COMPILE ?= pip-compile --rebuild --upgrade --allow-unsafe $(CMD_PIP_COMPILE_OPTS)

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
# Make sure to compile files after any other files they include!
$(CMD_PIP_COMPILE) --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
$(CMD_PIP_COMPILE) --rebuild -o requirements/pip.txt requirements/pip.in
$(CMD_PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ djangorestframework # Used by codejail_service app
edx-drf-extensions # Used by codejail_service app
edx-toggles # Used by codejail_service app
jsonschema # Parse and validate JSON; used by codejail_service app
setuptools
26 changes: 10 additions & 16 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand All @@ -24,7 +24,7 @@ click==8.1.7
# edx-django-utils
code-annotations==1.6.0
# via edx-toggles
cryptography==42.0.3
cryptography==42.0.5
# via pyjwt
django==3.2.24
# via
Expand Down Expand Up @@ -69,10 +69,6 @@ edx-toggles==5.1.1
# via -r requirements/base.in
idna==3.6
# via requests
importlib-resources==6.1.1
# via
# jsonschema
# jsonschema-specifications
jinja2==3.1.3
# via code-annotations
jsonschema==4.21.1
Expand All @@ -81,12 +77,10 @@ jsonschema-specifications==2023.12.1
# via jsonschema
markupsafe==2.1.5
# via jinja2
newrelic==9.6.0
newrelic==9.7.0
# via edx-django-utils
pbr==6.0.0
# via stevedore
pkgutil-resolve-name==1.3.10
# via jsonschema
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
Expand Down Expand Up @@ -123,18 +117,18 @@ six==1.16.0
# via edx-codejail
sqlparse==0.4.4
# via django
stevedore==5.1.0
stevedore==5.2.0
# via
# code-annotations
# edx-django-utils
# edx-opaque-keys
text-unidecode==1.3
# via python-slugify
typing-extensions==4.9.0
# via
# asgiref
# edx-opaque-keys
typing-extensions==4.10.0
# via edx-opaque-keys
urllib3==2.2.1
# via requests
zipp==3.17.0
# via importlib-resources

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.in
8 changes: 2 additions & 6 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand Down Expand Up @@ -28,11 +28,7 @@ pluggy==1.4.0
# via tox
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
# via -r requirements/ci.in
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
79 changes: 20 additions & 59 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand All @@ -8,7 +8,7 @@ asgiref==3.7.2
# via
# -r requirements/quality.txt
# django
astroid==3.0.3
astroid==3.1.0
# via
# -r requirements/quality.txt
# pylint
Expand Down Expand Up @@ -66,16 +66,15 @@ colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.4.1
coverage[toml]==7.4.3
# via
# -r requirements/quality.txt
# pytest-cov
cryptography==42.0.3
cryptography==42.0.5
# via
# -r requirements/quality.txt
# pyjwt
# secretstorage
ddt==1.7.1
ddt==1.7.2
# via -r requirements/quality.txt
diff-cover==8.0.3
# via -r requirements/dev.in
Expand Down Expand Up @@ -142,10 +141,6 @@ edx-opaque-keys==2.5.1
# edx-drf-extensions
edx-toggles==5.1.1
# via -r requirements/quality.txt
exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
filelock==3.13.1
# via
# -r requirements/ci.txt
Expand All @@ -157,17 +152,8 @@ idna==3.6
# requests
importlib-metadata==7.0.1
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# keyring
# twine
importlib-resources==6.1.1
# via
# -r requirements/quality.txt
# jsonschema
# jsonschema-specifications
# keyring
iniconfig==2.0.0
# via
# -r requirements/quality.txt
Expand All @@ -180,11 +166,6 @@ jaraco-classes==3.3.1
# via
# -r requirements/quality.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/quality.txt
# keyring
# secretstorage
jinja2==3.1.3
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -222,7 +203,7 @@ more-itertools==10.2.0
# via
# -r requirements/quality.txt
# jaraco-classes
newrelic==9.6.0
newrelic==9.7.0
# via
# -r requirements/quality.txt
# edx-django-utils
Expand Down Expand Up @@ -251,10 +232,6 @@ pkginfo==1.9.6
# via
# -r requirements/quality.txt
# twine
pkgutil-resolve-name==1.3.10
# via
# -r requirements/quality.txt
# jsonschema
platformdirs==4.2.0
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -294,7 +271,7 @@ pyjwt[crypto]==2.8.0
# -r requirements/quality.txt
# drf-jwt
# edx-drf-extensions
pylint==3.0.3
pylint==3.1.0
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -331,7 +308,7 @@ pyproject-hooks==1.0.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.0.1
pytest==8.0.2
# via
# -r requirements/quality.txt
# pytest-cov
Expand Down Expand Up @@ -386,10 +363,6 @@ rpds-py==0.18.0
# -r requirements/quality.txt
# jsonschema
# referencing
secretstorage==3.3.3
# via
# -r requirements/quality.txt
# keyring
semantic-version==2.10.0
# via
# -r requirements/quality.txt
Expand All @@ -407,7 +380,7 @@ sqlparse==0.4.4
# via
# -r requirements/quality.txt
# django
stevedore==5.1.0
stevedore==5.2.0
# via
# -r requirements/quality.txt
# code-annotations
Expand All @@ -417,19 +390,6 @@ text-unidecode==1.3
# via
# -r requirements/quality.txt
# python-slugify
tomli==2.0.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# coverage
# pip-tools
# pylint
# pyproject-api
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.3
# via
# -r requirements/quality.txt
Expand All @@ -438,20 +398,16 @@ tox==4.13.0
# via -r requirements/ci.txt
twine==5.0.0
# via -r requirements/quality.txt
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/quality.txt
# asgiref
# astroid
# edx-opaque-keys
# pylint
# rich
urllib3==2.2.1
# via
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.25.0
virtualenv==20.25.1
# via
# -r requirements/ci.txt
# tox
Expand All @@ -461,11 +417,16 @@ wheel==0.42.0
# pip-tools
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
pip==24.0
# via
# -r requirements/pip-tools.txt
# pip-tools
setuptools==69.1.1
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# pip-tools
Loading

0 comments on commit 04d5d9e

Please sign in to comment.