Merge pull request #472 from openedx/jenkins/upgrade-python-requireme…

…nts-e3802bd Python Requirements Update
openedx · Nov 29, 2023 · 9bded23 · 9bded23
2 parents e3802bd + 385764f
commit 9bded23
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 150 deletions.
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,10 +4,16 @@
 #
 #    make upgrade
 #
-certifi==2023.7.22
+cachetools==5.3.2
+    # via tox
+certifi==2023.11.17
     # via requests
+chardet==5.2.0
+    # via tox
 charset-normalizer==3.3.2
     # via requests
+colorama==0.4.6
+    # via tox
 coverage==6.5.0
     # via coveralls
 coveralls==3.3.1
@@ -23,24 +29,27 @@ filelock==3.13.1
 idna==3.4
     # via requests
 packaging==23.2
-    # via tox
+    # via
+    #   pyproject-api
+    #   tox
 platformdirs==3.11.0
-    # via virtualenv
+    # via
+    #   -c requirements/common_constraints.txt
+    #   tox
+    #   virtualenv
 pluggy==1.3.0
     # via tox
-py==1.11.0
+pyproject-api==1.6.1
     # via tox
 requests==2.31.0
     # via coveralls
-six==1.16.0
-    # via tox
 tomli==2.0.1
-    # via tox
-tox==3.28.0
     # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/ci.in
-urllib3==2.0.7
+    #   pyproject-api
+    #   tox
+tox==4.11.3
+    # via -r requirements/ci.in
+urllib3==2.1.0
     # via requests
-virtualenv==20.24.6
+virtualenv==20.24.7
     # via tox
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -22,6 +22,7 @@ elasticsearch<7.14.0
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
 
-# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
-# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
-tox<4.0.0
+# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
+# This constraint can be removed once the issue 
+# https://github.com/pypa/virtualenv/issues/2666 gets resolved 
+platformdirs<4.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -9,7 +9,6 @@ annotated-types==0.6.0
 anyio==3.7.1
     # via
     #   fastapi
-    #   httpcore
     #   starlette
 appdirs==1.4.4
     # via fs
@@ -19,11 +18,10 @@ astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
-certifi==2023.7.22
-    # via
-    #   httpcore
-    #   httpx
-    #   requests
+cachetools==5.3.2
+    # via tox
+certifi==2023.11.17
+    # via requests
 cffi==1.16.0
     # via
     #   cryptography
@@ -32,6 +30,7 @@ chardet==5.2.0
     # via
     #   diff-cover
     #   pysrt
+    #   tox
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
@@ -48,6 +47,8 @@ code-annotations==1.5.0
     # via
     #   edx-lint
     #   edx-toggles
+colorama==0.4.6
+    # via tox
 coverage[toml]==6.5.0
     # via
     #   -r requirements/test.in
@@ -59,9 +60,9 @@ cryptography==41.0.5
     # via
     #   pyjwt
     #   secretstorage
-ddt==1.6.0
+ddt==1.7.0
     # via -r requirements/test.in
-diff-cover==8.0.0
+diff-cover==8.0.1
     # via -r requirements/dev.in
 dill==0.3.7
     # via pylint
@@ -106,19 +107,19 @@ drf-jwt==1.19.2
     # via edx-drf-extensions
 edx-django-release-util==1.3.0
     # via -r requirements/base.in
-edx-django-utils==5.7.0
+edx-django-utils==5.8.0
     # via
     #   edx-drf-extensions
     #   edx-toggles
-edx-drf-extensions==8.13.0
+edx-drf-extensions==8.13.1
     # via -r requirements/base.in
 edx-lint==5.3.6
     # via -r requirements/quality.in
 edx-opaque-keys==2.5.1
     # via edx-drf-extensions
 edx-toggles==5.1.0
     # via -r requirements/base.in
-exceptiongroup==1.1.3
+exceptiongroup==1.2.0
     # via
     #   anyio
     #   pytest
@@ -131,23 +132,16 @@ filelock==3.13.1
 fs==2.4.16
     # via -r requirements/test.in
 h11==0.14.0
-    # via
-    #   httpcore
-    #   uvicorn
-httpcore==0.16.3
-    # via httpx
-httpx==0.23.3
-    # via pact-python
+    # via uvicorn
 idna==3.4
     # via
     #   anyio
     #   requests
-    #   rfc3986
 importlib-metadata==6.8.0
     # via
     #   keyring
     #   twine
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via keyring
 iniconfig==2.0.0
     # via pytest
@@ -165,7 +159,7 @@ jinja2==3.1.2
     # via
     #   code-annotations
     #   diff-cover
-keyring==24.2.0
+keyring==24.3.0
     # via twine
 lxml==4.9.3
     # via -r requirements/base.in
@@ -181,25 +175,28 @@ mock==5.1.0
     # via -r requirements/test.in
 more-itertools==10.1.0
     # via jaraco-classes
-newrelic==9.1.1
+newrelic==9.2.0
     # via edx-django-utils
 nh3==0.2.14
     # via readme-renderer
 packaging==23.2
     # via
+    #   pyproject-api
     #   pytest
     #   tox
-pact-python==2.0.1
+pact-python==2.1.1
     # via -r requirements/test.in
-pbr==5.11.1
+pbr==6.0.0
     # via stevedore
 pillow==10.1.0
     # via -r requirements/base.in
 pkginfo==1.9.6
     # via twine
 platformdirs==3.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   pylint
+    #   tox
     #   virtualenv
 pluggy==1.3.0
     # via
@@ -210,19 +207,17 @@ psutil==5.9.6
     # via
     #   edx-django-utils
     #   pact-python
-py==1.11.0
-    # via tox
 pycodestyle==2.11.1
     # via -r requirements/quality.in
 pycparser==2.21
     # via cffi
-pydantic==2.4.2
+pydantic==2.5.2
     # via fastapi
-pydantic-core==2.10.1
+pydantic-core==2.14.5
     # via pydantic
 pydocstyle==6.3.0
     # via -r requirements/quality.in
-pygments==2.16.1
+pygments==2.17.2
     # via
     #   diff-cover
     #   readme-renderer
@@ -250,6 +245,8 @@ pymongo==3.13.0
     # via edx-opaque-keys
 pynacl==1.5.0
     # via edx-django-utils
+pyproject-api==1.6.1
+    # via tox
 pysrt==1.1.2
     # via -r requirements/base.in
 pytest==7.4.3
@@ -258,7 +255,7 @@ pytest==7.4.3
     #   pytest-django
 pytest-cov==4.1.0
     # via -r requirements/test.in
-pytest-django==4.6.0
+pytest-django==4.7.0
     # via -r requirements/test.in
 python-slugify==8.0.1
     # via code-annotations
@@ -283,13 +280,11 @@ requests==2.31.0
     #   twine
 requests-toolbelt==1.0.0
     # via twine
-responses==0.23.3
+responses==0.24.1
     # via -r requirements/test.in
-rfc3986[idna2008]==1.5.0
-    # via
-    #   httpx
-    #   twine
-rich==13.6.0
+rfc3986==2.0.0
+    # via twine
+rich==13.7.0
     # via twine
 secretstorage==3.3.3
     # via keyring
@@ -301,12 +296,8 @@ six==1.16.0
     #   edx-lint
     #   fs
     #   pact-python
-    #   tox
 sniffio==1.3.0
-    # via
-    #   anyio
-    #   httpcore
-    #   httpx
+    # via anyio
 snowballstemmer==2.2.0
     # via pydocstyle
 sqlparse==0.4.4
@@ -324,18 +315,15 @@ tomli==2.0.1
     # via
     #   coverage
     #   pylint
+    #   pyproject-api
     #   pytest
     #   tox
-tomlkit==0.12.2
+tomlkit==0.12.3
     # via pylint
-tox==3.28.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/ci.in
+tox==4.11.3
+    # via -r requirements/ci.in
 twine==4.0.2
     # via -r requirements/quality.in
-types-pyyaml==6.0.12.12
-    # via responses
 typing-extensions==4.8.0
     # via
     #   annotated-types
@@ -349,15 +337,14 @@ typing-extensions==4.8.0
     #   rich
     #   starlette
     #   uvicorn
-urllib3==2.0.7
+urllib3==2.1.0
     # via
-    #   pact-python
     #   requests
     #   responses
     #   twine
-uvicorn==0.23.2
+uvicorn==0.24.0.post1
     # via pact-python
-virtualenv==20.24.6
+virtualenv==20.24.7
     # via tox
 zipp==3.17.0
     # via

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -10,5 +10,5 @@ wheel==0.41.3
 # The following packages are considered to be unsafe in a requirements file:
 pip==23.3.1
     # via -r requirements/pip.in
-setuptools==68.2.2
+setuptools==69.0.2
     # via -r requirements/pip.in