diff --git a/Makefile b/Makefile index b03b95e..61c54e4 100644 --- a/Makefile +++ b/Makefile @@ -34,23 +34,7 @@ CMD_PIP_COMPILE ?= pip-compile --rebuild --upgrade $(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) -o requirements/pip-tools.txt requirements/pip-tools.in - pip install -qr requirements/pip.txt - pip install -qr requirements/pip-tools.txt - $(CMD_PIP_COMPILE) -o requirements/base.txt requirements/base.in - $(CMD_PIP_COMPILE) -o requirements/test.txt requirements/test.in $(CMD_PIP_COMPILE) -o requirements/scripts.txt requirements/scripts.in - $(CMD_PIP_COMPILE) -o requirements/doc.txt requirements/doc.in - $(CMD_PIP_COMPILE) -o requirements/quality.txt requirements/quality.in - $(CMD_PIP_COMPILE) -o requirements/ci.txt requirements/ci.in - $(CMD_PIP_COMPILE) -o requirements/dev.txt requirements/dev.in - # Let tox control the Django version for tests - sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp - mv requirements/test.tmp requirements/test.txt - upgrade_package: ## update the requirements/*.txt file with the latest version of $package @test -n "$(package)" || { echo "\nUsage: make upgrade_package package=...\n"; exit 1; } diff --git a/requirements/base.txt b/requirements/base.txt index 9d87a3b..e0f4787 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,22 +8,21 @@ asgiref==3.7.2 # via django cffi==1.15.1 # via pynacl -click==8.1.6 +click==8.1.5 # via edx-django-utils django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # django-crum - # django-waffle # edx-django-utils django-crum==0.7.9 # via edx-django-utils -django-waffle==4.0.0 +django-waffle==3.0.0 # via edx-django-utils -edx-django-utils==5.7.0 +edx-django-utils==5.5.0 # via -r requirements/base.in -newrelic==8.9.0 +newrelic==8.8.1 # via edx-django-utils pbr==5.11.1 # via stevedore diff --git a/requirements/ci.txt b/requirements/ci.txt index 13f94c5..7c42abb 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -distlib==0.3.7 +distlib==0.3.6 # via virtualenv filelock==3.12.2 # via @@ -12,7 +12,7 @@ filelock==3.12.2 # virtualenv packaging==23.1 # via tox -platformdirs==3.10.0 +platformdirs==3.9.1 # via virtualenv pluggy==1.2.0 # via tox @@ -26,5 +26,5 @@ tox==3.28.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.in -virtualenv==20.24.2 +virtualenv==20.24.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index f5d98f3..16e0d9d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -21,21 +21,22 @@ build==0.10.0 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.7.22 +certifi==2023.5.7 # via # -r requirements/quality.txt # requests cffi==1.15.1 # via # -r requirements/quality.txt + # cryptography # pynacl -chardet==5.2.0 +chardet==5.1.0 # via diff-cover charset-normalizer==3.2.0 # via # -r requirements/quality.txt # requests -click==8.1.6 +click==8.1.5 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -48,7 +49,7 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.5.0 +code-annotations==1.3.0 # via # -r requirements/quality.txt # edx-lint @@ -56,13 +57,17 @@ coverage[toml]==7.2.7 # via # -r requirements/quality.txt # pytest-cov +cryptography==41.0.2 + # via + # -r requirements/quality.txt + # secretstorage diff-cover==7.7.0 # via -r requirements/dev.in -dill==0.3.7 +dill==0.3.6 # via # -r requirements/quality.txt # pylint -distlib==0.3.7 +distlib==0.3.6 # via # -r requirements/ci.txt # virtualenv @@ -71,14 +76,13 @@ django==3.2.20 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # django-crum - # django-waffle # edx-django-utils # edx-i18n-tools django-crum==0.7.9 # via # -r requirements/quality.txt # edx-django-utils -django-waffle==4.0.0 +django-waffle==3.0.0 # via # -r requirements/quality.txt # edx-django-utils @@ -86,9 +90,9 @@ docutils==0.20.1 # via # -r requirements/quality.txt # readme-renderer -edx-django-utils==5.7.0 +edx-django-utils==5.5.0 # via -r requirements/quality.txt -edx-i18n-tools==1.1.0 +edx-i18n-tools==1.0.0 # via -r requirements/dev.in edx-lint==5.3.4 # via -r requirements/quality.txt @@ -110,7 +114,7 @@ importlib-metadata==6.8.0 # -r requirements/quality.txt # keyring # twine -importlib-resources==6.0.1 +importlib-resources==6.0.0 # via # -r requirements/quality.txt # keyring @@ -126,6 +130,11 @@ jaraco-classes==3.3.0 # via # -r requirements/quality.txt # keyring +jeepney==0.8.0 + # via + # -r requirements/quality.txt + # keyring + # secretstorage jinja2==3.1.2 # via # -r requirements/quality.txt @@ -155,11 +164,11 @@ mdurl==0.1.2 # via # -r requirements/quality.txt # markdown-it-py -more-itertools==10.1.0 +more-itertools==9.1.0 # via # -r requirements/quality.txt # jaraco-classes -newrelic==8.9.0 +newrelic==8.8.1 # via # -r requirements/quality.txt # edx-django-utils @@ -177,13 +186,13 @@ pbr==5.11.1 # via # -r requirements/quality.txt # stevedore -pip-tools==7.3.0 +pip-tools==7.0.0 # via -r requirements/pip-tools.txt pkginfo==1.9.6 # via # -r requirements/quality.txt # twine -platformdirs==3.10.0 +platformdirs==3.9.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -206,7 +215,7 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.11.0 +pycodestyle==2.10.0 # via -r requirements/quality.txt pycparser==2.21 # via @@ -214,13 +223,13 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.txt -pygments==2.16.1 +pygments==2.15.1 # via # -r requirements/quality.txt # diff-cover # readme-renderer # rich -pylint==2.17.5 +pylint==2.17.4 # via # -r requirements/quality.txt # edx-lint @@ -265,7 +274,7 @@ pytz==2023.3 # via # -r requirements/quality.txt # django -pyyaml==6.0.1 +pyyaml==6.0 # via # -r requirements/quality.txt # code-annotations @@ -287,10 +296,14 @@ rfc3986==2.0.0 # via # -r requirements/quality.txt # twine -rich==13.5.2 +rich==13.4.2 # via # -r requirements/quality.txt # twine +secretstorage==3.3.3 + # via + # -r requirements/quality.txt + # keyring six==1.16.0 # via # -r requirements/ci.txt @@ -327,7 +340,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.12.1 +tomlkit==0.11.8 # via # -r requirements/quality.txt # pylint @@ -347,12 +360,12 @@ typing-extensions==4.7.1 # astroid # pylint # rich -urllib3==2.0.4 +urllib3==2.0.3 # via # -r requirements/quality.txt # requests # twine -virtualenv==20.24.2 +virtualenv==20.24.0 # via # -r requirements/ci.txt # tox @@ -360,7 +373,7 @@ webencodings==0.5.1 # via # -r requirements/quality.txt # bleach -wheel==0.41.1 +wheel==0.40.0 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/doc.txt b/requirements/doc.txt index a59933b..7bcbda3 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -14,7 +14,7 @@ babel==2.12.1 # via sphinx bleach==6.0.0 # via readme-renderer -certifi==2023.7.22 +certifi==2023.5.7 # via requests cffi==1.15.1 # via @@ -22,12 +22,12 @@ cffi==1.15.1 # pynacl charset-normalizer==3.2.0 # via requests -click==8.1.6 +click==8.1.5 # via # -r requirements/test.txt # code-annotations # edx-django-utils -code-annotations==1.5.0 +code-annotations==1.3.0 # via -r requirements/test.txt coverage[toml]==7.2.7 # via @@ -38,13 +38,12 @@ django==3.2.20 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-crum - # django-waffle # edx-django-utils django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-waffle==4.0.0 +django-waffle==3.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -56,7 +55,7 @@ docutils==0.19 # readme-renderer # restructuredtext-lint # sphinx -edx-django-utils==5.7.0 +edx-django-utils==5.5.0 # via -r requirements/test.txt edx-sphinx-theme==3.1.0 # via -r requirements/doc.in @@ -83,7 +82,7 @@ markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 -newrelic==8.9.0 +newrelic==8.8.1 # via # -r requirements/test.txt # edx-django-utils @@ -108,7 +107,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pygments==2.16.1 +pygments==2.15.1 # via # doc8 # readme-renderer @@ -191,7 +190,7 @@ typing-extensions==4.7.1 # via # -r requirements/test.txt # asgiref -urllib3==2.0.4 +urllib3==2.0.3 # via requests webencodings==0.5.1 # via bleach diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 07c0707..5a27e2a 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,11 +6,11 @@ # build==0.10.0 # via pip-tools -click==8.1.6 +click==8.1.5 # via pip-tools packaging==23.1 # via build -pip-tools==7.3.0 +pip-tools==7.0.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build @@ -18,8 +18,7 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks -wheel==0.41.1 +wheel==0.40.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 5e2f760..bd9fb55 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.1 +wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2.1 +pip==23.2 # via -r requirements/pip.in setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 8886cdf..999fb4a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -14,15 +14,16 @@ astroid==2.15.6 # pylint-celery bleach==6.0.0 # via readme-renderer -certifi==2023.7.22 +certifi==2023.5.7 # via requests cffi==1.15.1 # via # -r requirements/test.txt + # cryptography # pynacl charset-normalizer==3.2.0 # via requests -click==8.1.6 +click==8.1.5 # via # -r requirements/test.txt # click-log @@ -31,7 +32,7 @@ click==8.1.6 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.5.0 +code-annotations==1.3.0 # via # -r requirements/test.txt # edx-lint @@ -39,26 +40,27 @@ coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -dill==0.3.7 +cryptography==41.0.2 + # via secretstorage +dill==0.3.6 # via pylint django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-crum - # django-waffle # edx-django-utils django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-waffle==4.0.0 +django-waffle==3.0.0 # via # -r requirements/test.txt # edx-django-utils docutils==0.20.1 # via readme-renderer -edx-django-utils==5.7.0 +edx-django-utils==5.5.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/quality.in @@ -72,7 +74,7 @@ importlib-metadata==6.8.0 # via # keyring # twine -importlib-resources==6.0.1 +importlib-resources==6.0.0 # via keyring iniconfig==2.0.0 # via @@ -84,6 +86,10 @@ isort==5.12.0 # pylint jaraco-classes==3.3.0 # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt @@ -102,9 +108,9 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -more-itertools==10.1.0 +more-itertools==9.1.0 # via jaraco-classes -newrelic==8.9.0 +newrelic==8.8.1 # via # -r requirements/test.txt # edx-django-utils @@ -118,7 +124,7 @@ pbr==5.11.1 # stevedore pkginfo==1.9.6 # via twine -platformdirs==3.10.0 +platformdirs==3.9.1 # via pylint pluggy==1.2.0 # via @@ -128,7 +134,7 @@ psutil==5.9.5 # via # -r requirements/test.txt # edx-django-utils -pycodestyle==2.11.0 +pycodestyle==2.10.0 # via -r requirements/quality.in pycparser==2.21 # via @@ -136,11 +142,11 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pygments==2.16.1 +pygments==2.15.1 # via # readme-renderer # rich -pylint==2.17.5 +pylint==2.17.4 # via # edx-lint # pylint-celery @@ -189,8 +195,10 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.5.2 +rich==13.4.2 # via twine +secretstorage==3.3.3 + # via keyring six==1.16.0 # via # bleach @@ -216,7 +224,7 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.12.1 +tomlkit==0.11.8 # via pylint twine==4.0.2 # via -r requirements/quality.in @@ -227,7 +235,7 @@ typing-extensions==4.7.1 # astroid # pylint # rich -urllib3==2.0.4 +urllib3==2.0.3 # via # requests # twine diff --git a/requirements/scripts.txt b/requirements/scripts.txt index 294ae74..fd6705c 100644 --- a/requirements/scripts.txt +++ b/requirements/scripts.txt @@ -20,7 +20,7 @@ cffi==1.15.1 # pynacl charset-normalizer==3.2.0 # via requests -click==8.1.6 +click==8.1.5 # via # -r requirements/base.txt # code-annotations @@ -34,7 +34,6 @@ django==3.2.20 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-crum - # django-waffle # edx-django-utils # edx-event-bus-kafka # edx-toggles @@ -44,12 +43,12 @@ django-crum==0.7.9 # -r requirements/base.txt # edx-django-utils # edx-toggles -django-waffle==4.0.0 +django-waffle==3.0.0 # via # -r requirements/base.txt # edx-django-utils # edx-toggles -edx-django-utils==5.7.0 +edx-django-utils==5.5.0 # via # -r requirements/base.txt # edx-event-bus-kafka @@ -70,7 +69,7 @@ jinja2==3.1.2 # via code-annotations markupsafe==2.1.3 # via jinja2 -newrelic==8.9.0 +newrelic==8.8.1 # via # -r requirements/base.txt # edx-django-utils diff --git a/requirements/test.txt b/requirements/test.txt index bc04a07..35a299e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,12 +12,12 @@ cffi==1.15.1 # via # -r requirements/base.txt # pynacl -click==8.1.6 +click==8.1.5 # via # -r requirements/base.txt # code-annotations # edx-django-utils -code-annotations==1.5.0 +code-annotations==1.3.0 # via -r requirements/test.in coverage[toml]==7.2.7 # via pytest-cov @@ -25,17 +25,16 @@ coverage[toml]==7.2.7 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-crum - # django-waffle # edx-django-utils django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-waffle==4.0.0 +django-waffle==3.0.0 # via # -r requirements/base.txt # edx-django-utils -edx-django-utils==5.7.0 +edx-django-utils==5.5.0 # via -r requirements/base.txt exceptiongroup==1.1.2 # via pytest @@ -45,7 +44,7 @@ jinja2==3.1.2 # via code-annotations markupsafe==2.1.3 # via jinja2 -newrelic==8.9.0 +newrelic==8.8.1 # via # -r requirements/base.txt # edx-django-utils