fixup!: requirements again

edx · Aug 16, 2023 · 6b6f0d7 · 6b6f0d7
1 parent 55623d4
commit 6b6f0d7
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 91 deletions.
diff --git 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
@@ -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
@@ -4,15 +4,15 @@
 #
 #    make upgrade
 #
-distlib==0.3.7
+distlib==0.3.6
     # via virtualenv
 filelock==3.12.2
     # via
     #   tox
     #   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
@@ -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,21 +49,25 @@ 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
 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,24 +76,23 @@ 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
 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,21 +215,21 @@ 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
     #   -r requirements/quality.txt
     #   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,20 +360,20 @@ 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
 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
@@ -14,20 +14,20 @@ 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
     #   -r requirements/test.txt
     #   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
@@ -6,20 +6,19 @@
 #
 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
 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: