chore: upgrading packages and fixing tests.

openedx · Dec 4, 2023 · be00ba9 · be00ba9
1 parent da64bcd
commit be00ba9
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 72 deletions.
diff --git a/repo_health/check_django_dependencies_compatibility.py b/repo_health/check_django_dependencies_compatibility.py
@@ -147,8 +147,9 @@ def get_upgraded_dependencies_count(repo_path, django_dependency_sheet) -> tuple
             package_name = line["Django Package Name"]
             if package_name in deps.keys():  # pylint: disable=consider-iterating-dictionary
                 django_deps.append(package_name)
-
-                if line["Django 3.2"] and line["Django 3.2"] != '-':
+                # If the package support is included in the master branch but hasn't been released,
+                # it won't be regarded as a supported version.
+                if line["Django 3.2"] and line["Django 3.2"] not in ['-', 'master']:
                     deps_support_django32.append(package_name)
 
                     if parse(deps[package_name]) >= parse(line["Django 3.2"]):

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -56,10 +56,8 @@ multidict==6.0.4
     #   yarl
 oauthlib==3.2.2
     # via requests-oauthlib
-packaging==21.3
-    # via
-    #   -c requirements/constraints.txt
-    #   pytest
+packaging==23.2
+    # via pytest
 pluggy==1.3.0
     # via pytest
 pyasn1==0.5.1
@@ -68,16 +66,14 @@ pyasn1==0.5.1
     #   rsa
 pyasn1-modules==0.3.0
     # via google-auth
-pyparsing==3.1.1
-    # via packaging
 pytest==7.4.3
     # via
     #   pytest-aiohttp
     #   pytest-asyncio
     #   pytest-repo-health
 pytest-aiohttp==1.0.5
     # via pytest-repo-health
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.2
     # via
     #   -r requirements/base.in
     #   pytest-aiohttp

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -16,27 +16,23 @@ filelock==3.13.1
     # via
     #   tox
     #   virtualenv
-packaging==21.3
+packaging==23.2
     # via
-    #   -c requirements/constraints.txt
     #   pyproject-api
     #   tox
-platformdirs==3.11.0
+platformdirs==4.0.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   tox
     #   virtualenv
 pluggy==1.3.0
     # via tox
-pyparsing==3.1.1
-    # via packaging
-pyproject-api==1.5.0
+pyproject-api==1.6.1
     # via tox
 tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.0.0
+tox==4.11.4
     # via -r requirements/ci.in
 virtualenv==20.25.0
     # via tox
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -12,9 +12,6 @@
 # This file contains all common constraints for edx-repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
 
-# greater version breaking test.
-packaging==21.3
-
-# gspread==5.12.0 contains breaking changes 
+# gspread==5.12.0 contains breaking changes
 # which break the scheduled repo health job
 gspread<5.12.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -138,7 +138,7 @@ idna==3.6
     #   -r requirements/quality.txt
     #   requests
     #   yarl
-importlib-metadata==6.9.0
+importlib-metadata==7.0.0
     # via
     #   -r requirements/pip-tools.txt
     #   build
@@ -176,9 +176,8 @@ oauthlib==3.2.2
     # via
     #   -r requirements/quality.txt
     #   requests-oauthlib
-packaging==21.3
+packaging==23.2
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/ci.txt
     #   -r requirements/pip-tools.txt
     #   -r requirements/quality.txt
@@ -192,9 +191,8 @@ pbr==6.0.0
     #   stevedore
 pip-tools==7.3.0
     # via -r requirements/pip-tools.txt
-platformdirs==3.11.0
+platformdirs==4.0.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   pylint
@@ -244,13 +242,7 @@ pylint-plugin-utils==0.8.2
     #   -r requirements/quality.txt
     #   pylint-celery
     #   pylint-django
-pyparsing==3.1.1
-    # via
-    #   -r requirements/ci.txt
-    #   -r requirements/pip-tools.txt
-    #   -r requirements/quality.txt
-    #   packaging
-pyproject-api==1.5.0
+pyproject-api==1.6.1
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -269,7 +261,7 @@ pytest-aiohttp==1.0.5
     # via
     #   -r requirements/quality.txt
     #   pytest-repo-health
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.2
     # via
     #   -r requirements/quality.txt
     #   pytest-aiohttp
@@ -349,7 +341,7 @@ tomlkit==0.12.3
     # via
     #   -r requirements/quality.txt
     #   pylint
-tox==4.0.0
+tox==4.11.4
     # via -r requirements/ci.txt
 typing-extensions==4.8.0
     # via

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -98,7 +98,7 @@ idna==3.6
     #   yarl
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==6.9.0
+importlib-metadata==7.0.0
     # via sphinx
 iniconfig==2.0.0
     # via
@@ -119,9 +119,8 @@ oauthlib==3.2.2
     # via
     #   -r requirements/test.txt
     #   requests-oauthlib
-packaging==21.3
+packaging==23.2
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   pydata-sphinx-theme
     #   pytest
@@ -150,10 +149,6 @@ pygments==2.17.2
     #   pydata-sphinx-theme
     #   readme-renderer
     #   sphinx
-pyparsing==3.1.1
-    # via
-    #   -r requirements/test.txt
-    #   packaging
 pytest==7.4.3
     # via
     #   -r requirements/test.txt
@@ -165,7 +160,7 @@ pytest-aiohttp==1.0.5
     # via
     #   -r requirements/test.txt
     #   pytest-repo-health
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.2
     # via
     #   -r requirements/test.txt
     #   pytest-aiohttp

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -8,16 +8,12 @@ build==1.0.3
     # via pip-tools
 click==8.1.7
     # via pip-tools
-importlib-metadata==6.9.0
+importlib-metadata==7.0.0
+    # via build
+packaging==23.2
     # via build
-packaging==21.3
-    # via
-    #   -c requirements/constraints.txt
-    #   build
 pip-tools==7.3.0
     # via -r requirements/pip-tools.in
-pyparsing==3.1.1
-    # via packaging
 pyproject-hooks==1.0.0
     # via build
 tomli==2.0.1

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -123,17 +123,14 @@ oauthlib==3.2.2
     # via
     #   -r requirements/test.txt
     #   requests-oauthlib
-packaging==21.3
+packaging==23.2
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   pytest
 pbr==6.0.0
     # via stevedore
-platformdirs==3.11.0
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   pylint
+platformdirs==4.0.0
+    # via pylint
 pluggy==1.3.0
     # via
     #   -r requirements/test.txt
@@ -165,10 +162,6 @@ pylint-plugin-utils==0.8.2
     # via
     #   pylint-celery
     #   pylint-django
-pyparsing==3.1.1
-    # via
-    #   -r requirements/test.txt
-    #   packaging
 pytest==7.4.3
     # via
     #   -r requirements/test.txt
@@ -180,7 +173,7 @@ pytest-aiohttp==1.0.5
     # via
     #   -r requirements/test.txt
     #   pytest-repo-health
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.2
     # via
     #   -r requirements/test.txt
     #   pytest-aiohttp

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -89,9 +89,8 @@ oauthlib==3.2.2
     # via
     #   -r requirements/base.txt
     #   requests-oauthlib
-packaging==21.3
+packaging==23.2
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   pytest
 pluggy==1.3.0
@@ -107,10 +106,6 @@ pyasn1-modules==0.3.0
     # via
     #   -r requirements/base.txt
     #   google-auth
-pyparsing==3.1.1
-    # via
-    #   -r requirements/base.txt
-    #   packaging
 pytest==7.4.3
     # via
     #   -r requirements/base.txt
@@ -122,7 +117,7 @@ pytest-aiohttp==1.0.5
     # via
     #   -r requirements/base.txt
     #   pytest-repo-health
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.2
     # via
     #   -r requirements/base.txt
     #   pytest-aiohttp

diff --git a/tests/data/mock_django_dependencies_sheet.csv b/tests/data/mock_django_dependencies_sheet.csv
@@ -3,5 +3,5 @@
 40,edx-opaque-keys,yes,-,2.2.0,2.2.0,-,"Feb 1, 2021",,,
 103,django-storages,,1.11,1.8,1.1,-,"Jun 21, 2021",https://github.com/edx/upgrades/issues/44,,
 110,edx-django-utils,yes,-,master,4.2.0,4.2.0,"Jul 14, 2021",BOM-2634,,
-30,djangorestframework,,3.12.3,3.11.0,3.12.0,p,"Jun 30, 2021",,,3.12.4
+30,djangorestframework,,3.12.3,3.11.0,3.12.0,3.13.0,"Jun 30, 2021",,,3.12.4
 29,django-waffle,,2.2.0,0.19.0,2.0.0,-,"May 22, 2021",,,
diff --git a/tests/fake_repos/python_repo/requirements/base.txt b/tests/fake_repos/python_repo/requirements/base.txt
@@ -12,7 +12,7 @@ django==2.2.24
     #   -r requirements/base.in
     #   djangorestframework
     #   edx-django-utils
-djangorestframework==3.12.4
+djangorestframework==3.13.0
     # via -r requirements/base.in
 edx-django-utils==2.0.4
     # via

diff --git a/tests/fake_repos/python_repo/requirements/dev.txt b/tests/fake_repos/python_repo/requirements/dev.txt
@@ -68,7 +68,7 @@ django==2.2.24
     #   edx-django-utils
     #   edx-i18n-tools
     #   edx-lint
-djangorestframework==3.12.4
+djangorestframework==3.13.0
     # via -r requirements/quality.txt
 edx-django-utils==2.0.4
     # via

diff --git a/tests/fake_repos/python_repo/requirements/quality.txt b/tests/fake_repos/python_repo/requirements/quality.txt
@@ -39,7 +39,7 @@ django==2.2.24
     #   djangorestframework
     #   edx-django-utils
     #   edx-lint
-djangorestframework==3.12.4
+djangorestframework==3.13.0
     # via -r requirements/test.txt
 edx-django-utils==2.0.4
     # via