From 04d5d9ed0d26c90a88372f555216af97b2fa8080 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Mon, 26 Feb 2024 18:35:05 +0500 Subject: [PATCH] fix: include setuptools in requirements --- Makefile | 4 +- requirements/base.in | 1 + requirements/base.txt | 26 +++++-------- requirements/ci.txt | 8 +--- requirements/dev.txt | 79 ++++++++++---------------------------- requirements/doc.txt | 60 +++++++++-------------------- requirements/pip-tools.txt | 17 +++----- requirements/pip.txt | 4 +- requirements/quality.txt | 64 ++++++++---------------------- requirements/scripts.txt | 30 +++++---------- requirements/test.txt | 40 ++++++------------- 11 files changed, 98 insertions(+), 235 deletions(-) diff --git a/Makefile b/Makefile index f831242..febdde3 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/requirements/base.in b/requirements/base.in index 924dd37..0c30bbe 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -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 diff --git a/requirements/base.txt b/requirements/base.txt index 6b3af1e..49b4e84 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/ci.txt b/requirements/ci.txt index bd57292..5757c41 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -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 @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 096a3b8..02331a6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/doc.txt b/requirements/doc.txt index ef3fbcf..476f536 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,10 +1,10 @@ # -# 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 # -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx asgiref==3.7.2 # via @@ -39,15 +39,15 @@ code-annotations==1.6.0 # via # -r requirements/test.txt # edx-toggles -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.3 +cryptography==42.0.5 # via # -r requirements/test.txt # pyjwt -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt django==3.2.24 # via @@ -105,23 +105,12 @@ edx-sphinx-theme==3.1.0 # via -r requirements/doc.in edx-toggles==5.1.1 # via -r requirements/test.txt -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest idna==3.6 # via # -r requirements/test.txt # requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.1 - # via sphinx -importlib-resources==6.1.1 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications iniconfig==2.0.0 # via # -r requirements/test.txt @@ -141,7 +130,7 @@ markupsafe==2.1.5 # via # -r requirements/test.txt # jinja2 -newrelic==9.6.0 +newrelic==9.7.0 # via # -r requirements/test.txt # edx-django-utils @@ -156,10 +145,6 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/test.txt - # jsonschema pluggy==1.4.0 # via # -r requirements/test.txt @@ -190,7 +175,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.0.1 +pytest==8.0.2 # via # -r requirements/test.txt # pytest-cov @@ -206,7 +191,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt - # babel # django # djangorestframework pyyaml==6.0.1 @@ -247,23 +231,23 @@ sphinx==5.3.0 # via # -r requirements/doc.in # edx-sphinx-theme -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations @@ -274,23 +258,15 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 +typing-extensions==4.10.0 # via # -r requirements/test.txt - # coverage - # doc8 - # pytest -typing-extensions==4.9.0 - # via - # -r requirements/test.txt - # asgiref # edx-opaque-keys urllib3==2.2.1 # via # -r requirements/test.txt # requests -zipp==3.17.0 - # via - # -r requirements/test.txt - # importlib-metadata - # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.1.1 + # via -r requirements/test.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d9..3ed9776 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -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 @@ -8,8 +8,6 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build packaging==23.2 # via build pip-tools==7.4.0 @@ -18,16 +16,11 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools - # pyproject-hooks wheel==0.42.0 # via pip-tools -zipp==3.17.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools +pip==24.0 + # via pip-tools +setuptools==69.1.1 + # via pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 71954cc..e45232f 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -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 @@ -10,5 +10,5 @@ wheel==0.42.0 # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.1.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 3ea9534..16a5fdf 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -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 @@ -8,7 +8,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # pylint # pylint-celery @@ -44,16 +44,15 @@ code-annotations==1.6.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.3 +cryptography==42.0.5 # via # -r requirements/test.txt # pyjwt - # secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 # via pylint @@ -107,24 +106,12 @@ edx-opaque-keys==2.5.1 # edx-drf-extensions edx-toggles==5.1.1 # via -r requirements/test.txt -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest idna==3.6 # via # -r requirements/test.txt # requests importlib-metadata==7.0.1 - # via - # keyring - # twine -importlib-resources==6.1.1 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications - # keyring + # via twine iniconfig==2.0.0 # via # -r requirements/test.txt @@ -135,10 +122,6 @@ isort==5.13.2 # pylint jaraco-classes==3.3.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.3 # via # -r requirements/test.txt @@ -163,7 +146,7 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==10.2.0 # via jaraco-classes -newrelic==9.6.0 +newrelic==9.7.0 # via # -r requirements/test.txt # edx-django-utils @@ -179,10 +162,6 @@ pbr==6.0.0 # stevedore pkginfo==1.9.6 # via twine -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/test.txt - # jsonschema platformdirs==4.2.0 # via pylint pluggy==1.4.0 @@ -210,7 +189,7 @@ pyjwt[crypto]==2.8.0 # -r requirements/test.txt # drf-jwt # edx-drf-extensions -pylint==3.0.3 +pylint==3.1.0 # via # edx-lint # pylint-celery @@ -232,7 +211,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.0.1 +pytest==8.0.2 # via # -r requirements/test.txt # pytest-cov @@ -278,8 +257,6 @@ rpds-py==0.18.0 # -r requirements/test.txt # jsonschema # referencing -secretstorage==3.3.3 - # via keyring semantic-version==2.10.0 # via # -r requirements/test.txt @@ -295,7 +272,7 @@ sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations @@ -305,31 +282,22 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/test.txt - # coverage - # pylint - # pytest tomlkit==0.12.3 # via pylint twine==5.0.0 # via -r requirements/quality.in -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/test.txt - # asgiref - # astroid # edx-opaque-keys - # pylint - # rich urllib3==2.2.1 # via # -r requirements/test.txt # requests # twine zipp==3.17.0 - # via - # -r requirements/test.txt - # importlib-metadata - # importlib-resources + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.1.1 + # via -r requirements/test.txt diff --git a/requirements/scripts.txt b/requirements/scripts.txt index cb70a86..4c29368 100644 --- a/requirements/scripts.txt +++ b/requirements/scripts.txt @@ -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 @@ -40,7 +40,7 @@ code-annotations==1.6.0 # edx-toggles confluent-kafka[avro]==2.3.0 # via -r requirements/scripts.in -cryptography==42.0.3 +cryptography==42.0.5 # via # -r requirements/base.txt # pyjwt @@ -107,11 +107,6 @@ idna==3.6 # via # -r requirements/base.txt # requests -importlib-resources==6.1.1 - # via - # -r requirements/base.txt - # jsonschema - # jsonschema-specifications jinja2==3.1.3 # via # -r requirements/base.txt @@ -126,20 +121,16 @@ markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 -newrelic==9.6.0 +newrelic==9.7.0 # via # -r requirements/base.txt # edx-django-utils -openedx-events==9.5.1 +openedx-events==9.5.2 # via edx-event-bus-kafka pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/base.txt - # jsonschema psutil==5.9.8 # via # -r requirements/base.txt @@ -201,7 +192,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -211,16 +202,15 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt - # asgiref # edx-opaque-keys urllib3==2.2.1 # via # -r requirements/base.txt # requests -zipp==3.17.0 - # via - # -r requirements/base.txt - # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.1.1 + # via -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index 09260b3..20da224 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 @@ -36,13 +36,13 @@ code-annotations==1.6.0 # -r requirements/base.txt # -r requirements/test.in # edx-toggles -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via pytest-cov -cryptography==42.0.3 +cryptography==42.0.5 # via # -r requirements/base.txt # pyjwt -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.in # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -89,17 +89,10 @@ edx-opaque-keys==2.5.1 # edx-drf-extensions edx-toggles==5.1.1 # via -r requirements/base.txt -exceptiongroup==1.2.0 - # via pytest idna==3.6 # via # -r requirements/base.txt # requests -importlib-resources==6.1.1 - # via - # -r requirements/base.txt - # jsonschema - # jsonschema-specifications iniconfig==2.0.0 # via pytest jinja2==3.1.3 @@ -116,7 +109,7 @@ markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 -newrelic==9.6.0 +newrelic==9.7.0 # via # -r requirements/base.txt # edx-django-utils @@ -126,10 +119,6 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/base.txt - # jsonschema pluggy==1.4.0 # via pytest psutil==5.9.8 @@ -153,7 +142,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.0.1 +pytest==8.0.2 # via # pytest-cov # pytest-django @@ -200,7 +189,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -210,20 +199,15 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -tomli==2.0.1 - # via - # coverage - # pytest -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt - # asgiref # edx-opaque-keys urllib3==2.2.1 # via # -r requirements/base.txt # requests -zipp==3.17.0 - # via - # -r requirements/base.txt - # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.1.1 + # via -r requirements/base.txt