From c6f0686f20593dde5b82e6a8bb9236d6e9224269 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Wed, 27 Mar 2024 13:51:48 +0500 Subject: [PATCH] feat: Adding python3.12 support. --- .github/workflows/ci.yml | 2 +- requirements/base.in | 1 + requirements/base.txt | 24 +++++++------ requirements/common_constraints.txt | 8 +++++ requirements/constraints.txt | 4 +++ requirements/dev.txt | 53 ++++++++++++++--------------- requirements/doc.txt | 36 ++++++++++---------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 +-- requirements/production.txt | 20 +++++------ requirements/quality.txt | 36 ++++++++++---------- requirements/test.txt | 37 ++++++++++---------- tox.ini | 6 +++- 13 files changed, 126 insertions(+), 107 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16fe612c..15b964c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8"] + python-version: ["3.8", "3.12"] toxenv: [django42, quality, pii_check, check_keywords] steps: - uses: actions/checkout@v2 diff --git a/requirements/base.in b/requirements/base.in index 9d04ed3b..1b80c372 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -26,3 +26,4 @@ mock inflect social-auth-core boto3 +setuptools diff --git a/requirements/base.txt b/requirements/base.txt index 35065aae..8d651fa7 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,15 +10,16 @@ asgiref==3.8.1 # via # django # django-cors-headers -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # django # djangorestframework beautifulsoup4==4.12.3 # via wagtail -boto3==1.34.141 +boto3==1.34.151 # via -r requirements/base.in -botocore==1.34.141 +botocore==1.34.151 # via # boto3 # s3transfer @@ -32,7 +33,7 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via edx-django-utils -cryptography==42.0.8 +cryptography==43.0.0 # via # pyjwt # social-auth-core @@ -114,7 +115,7 @@ edx-auth-backends==4.3.0 # via -r requirements/base.in edx-django-release-util==1.4.0 # via -r requirements/base.in -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.in # edx-drf-extensions @@ -155,7 +156,7 @@ more-itertools==10.3.0 # via inflect mysqlclient==2.2.4 # via -r requirements/base.in -newrelic==9.11.0 +newrelic==9.12.0 # via edx-django-utils oauthlib==3.2.2 # via @@ -171,7 +172,7 @@ pillow==10.4.0 # via # pillow-heif # wagtail -pillow-heif==0.17.0 +pillow-heif==0.18.0 # via willow psutil==6.0.0 # via edx-django-utils @@ -226,7 +227,7 @@ six==1.16.0 # python-dateutil slumber==0.7.1 # via edx-rest-api-client -social-auth-app-django==5.4.1 +social-auth-app-django==5.4.2 # via # -r requirements/base.in # edx-auth-backends @@ -237,7 +238,7 @@ social-auth-core==4.5.4 # social-auth-app-django soupsieve==2.5 # via beautifulsoup4 -sqlparse==0.5.0 +sqlparse==0.5.1 # via django stevedore==5.2.0 # via @@ -259,7 +260,7 @@ urllib3==1.26.19 # via # botocore # requests -wagtail==6.1.2 +wagtail==6.1.3 # via -r requirements/base.in willow[heif]==1.8.0 # via @@ -269,3 +270,6 @@ zipp==3.19.2 # via # -r requirements/base.in # importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index e3bf8eae..b957ec4c 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -17,6 +17,7 @@ Django<5.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html +# See https://github.com/openedx/edx-platform/issues/35126 for more info elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected @@ -30,3 +31,10 @@ django-simple-history==3.0.0 # So we need to pin it globally, for now. # Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 importlib-metadata<7 + +# Cause: https://github.com/openedx/event-tracking/pull/290 +# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. +# We will pin event-tracking to do not break existing installations +# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 +# has been resolved and edx-platform is running with pymongo>=4.4.0 +event-tracking<2.4.1 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c7e2bc6b..634f9ff3 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -17,3 +17,7 @@ edx_rest_api_client==4.0.1 # versions>4.0.1 have backward incompatible chan # Django5 release is inline. So better to add constraint. Django<4.3 + + +# Temporary to Support the python 3.11 Upgrade +backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library diff --git a/requirements/dev.txt b/requirements/dev.txt index d10c864b..8a7d9877 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -13,13 +13,14 @@ asgiref==3.8.1 # -r requirements/quality.txt # django # django-cors-headers -astroid==3.2.2 +astroid==3.2.4 # via # -r requirements/quality.txt # pylint # pylint-celery -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/quality.txt # django # djangorestframework @@ -27,14 +28,14 @@ beautifulsoup4==4.12.3 # via # -r requirements/quality.txt # wagtail -boto3==1.34.141 +boto3==1.34.151 # via -r requirements/quality.txt -botocore==1.34.141 +botocore==1.34.151 # via # -r requirements/quality.txt # boto3 # s3transfer -cachetools==5.3.3 +cachetools==5.4.0 # via # -r requirements/quality.txt # tox @@ -75,11 +76,11 @@ colorama==0.4.6 # via # -r requirements/quality.txt # tox -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 # via # -r requirements/quality.txt # pytest-cov -cryptography==42.0.8 +cryptography==43.0.0 # via # -r requirements/quality.txt # pyjwt @@ -90,7 +91,7 @@ defusedxml==0.8.0rc2 # python3-openid # social-auth-core # willow -diff-cover==9.1.0 +diff-cover==9.1.1 # via -r requirements/dev.in dill==0.3.8 # via @@ -134,7 +135,7 @@ django-crum==0.7.9 # via # -r requirements/quality.txt # edx-django-utils -django-debug-toolbar==4.4.5 +django-debug-toolbar==4.4.6 # via -r requirements/dev.in django-dynamic-fixture==4.0.1 # via -r requirements/quality.txt @@ -197,16 +198,16 @@ edx-auth-backends==4.3.0 # via -r requirements/quality.txt edx-django-release-util==1.4.0 # via -r requirements/quality.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/quality.txt # edx-drf-extensions # edx-rest-api-client edx-drf-extensions==10.3.0 # via -r requirements/quality.txt -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via -r requirements/dev.in -edx-lint==5.3.6 +edx-lint==5.3.7 # via -r requirements/quality.txt edx-opaque-keys==2.10.0 # via @@ -220,7 +221,7 @@ et-xmlfile==1.1.0 # via # -r requirements/quality.txt # openpyxl -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via # -r requirements/quality.txt # pytest @@ -280,12 +281,8 @@ laces==0.1.1 # via # -r requirements/quality.txt # wagtail -lxml[html-clean,html_clean]==5.2.2 - # via - # edx-i18n-tools - # lxml-html-clean -lxml-html-clean==0.1.1 - # via lxml +lxml==5.2.2 + # via edx-i18n-tools markupsafe==2.1.5 # via # -r requirements/quality.txt @@ -302,7 +299,7 @@ more-itertools==10.3.0 # inflect mysqlclient==2.2.4 # via -r requirements/quality.txt -newrelic==9.11.0 +newrelic==9.12.0 # via # -r requirements/quality.txt # edx-django-utils @@ -322,7 +319,7 @@ packaging==24.1 # pyproject-api # pytest # tox -path==16.14.0 +path==16.16.0 # via edx-i18n-tools pbr==6.0.0 # via @@ -333,7 +330,7 @@ pillow==10.4.0 # -r requirements/quality.txt # pillow-heif # wagtail -pillow-heif==0.17.0 +pillow-heif==0.18.0 # via # -r requirements/quality.txt # willow @@ -373,7 +370,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==3.2.5 +pylint==3.2.6 # via # -r requirements/quality.txt # edx-lint @@ -405,7 +402,7 @@ pyproject-api==1.7.1 # via # -r requirements/quality.txt # tox -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/quality.txt # pytest-cov @@ -477,7 +474,7 @@ snowballstemmer==2.2.0 # via # -r requirements/quality.txt # pydocstyle -social-auth-app-django==5.4.1 +social-auth-app-django==5.4.2 # via # -r requirements/quality.txt # edx-auth-backends @@ -490,7 +487,7 @@ soupsieve==2.5 # via # -r requirements/quality.txt # beautifulsoup4 -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/quality.txt # django @@ -517,7 +514,7 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.12.5 +tomlkit==0.13.0 # via # -r requirements/quality.txt # pylint @@ -549,7 +546,7 @@ virtualenv==20.26.3 # via # -r requirements/quality.txt # tox -wagtail==6.1.2 +wagtail==6.1.3 # via -r requirements/quality.txt willow[heif]==1.8.0 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index 0194e3d8..a2070173 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -15,14 +15,14 @@ asgiref==3.8.1 # -r requirements/test.txt # django # django-cors-headers -astroid==3.2.2 +astroid==3.2.4 # via # -r requirements/test.txt # pylint # pylint-celery babel==2.15.0 # via sphinx -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django @@ -31,14 +31,14 @@ beautifulsoup4==4.12.3 # via # -r requirements/test.txt # wagtail -boto3==1.34.141 +boto3==1.34.151 # via -r requirements/test.txt -botocore==1.34.141 +botocore==1.34.151 # via # -r requirements/test.txt # boto3 # s3transfer -cachetools==5.3.3 +cachetools==5.4.0 # via # -r requirements/test.txt # tox @@ -78,11 +78,11 @@ colorama==0.4.6 # via # -r requirements/test.txt # tox -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.8 +cryptography==43.0.0 # via # -r requirements/test.txt # pyjwt @@ -200,14 +200,14 @@ edx-auth-backends==4.3.0 # via -r requirements/test.txt edx-django-release-util==1.4.0 # via -r requirements/test.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/test.txt # edx-drf-extensions # edx-rest-api-client edx-drf-extensions==10.3.0 # via -r requirements/test.txt -edx-lint==5.3.6 +edx-lint==5.3.7 # via -r requirements/test.txt edx-opaque-keys==2.10.0 # via @@ -221,7 +221,7 @@ et-xmlfile==1.1.0 # via # -r requirements/test.txt # openpyxl -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via # -r requirements/test.txt # pytest @@ -299,7 +299,7 @@ more-itertools==10.3.0 # inflect mysqlclient==2.2.4 # via -r requirements/test.txt -newrelic==9.11.0 +newrelic==9.12.0 # via # -r requirements/test.txt # edx-django-utils @@ -331,7 +331,7 @@ pillow==10.4.0 # -r requirements/test.txt # pillow-heif # wagtail -pillow-heif==0.17.0 +pillow-heif==0.18.0 # via # -r requirements/test.txt # willow @@ -367,7 +367,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==3.2.5 +pylint==3.2.6 # via # -r requirements/test.txt # edx-lint @@ -399,7 +399,7 @@ pyproject-api==1.7.1 # via # -r requirements/test.txt # tox -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/test.txt # pytest-cov @@ -475,7 +475,7 @@ slumber==0.7.1 # edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -social-auth-app-django==5.4.1 +social-auth-app-django==5.4.2 # via # -r requirements/test.txt # edx-auth-backends @@ -504,7 +504,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/test.txt # django @@ -532,7 +532,7 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.12.5 +tomlkit==0.13.0 # via # -r requirements/test.txt # pylint @@ -564,7 +564,7 @@ virtualenv==20.26.3 # via # -r requirements/test.txt # tox -wagtail==6.1.2 +wagtail==6.1.3 # via -r requirements/test.txt willow[heif]==1.8.0 # via diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 6b0824f9..e34fcae5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,7 +8,7 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==8.0.0 +importlib-metadata==8.2.0 # via build packaging==24.1 # via build diff --git a/requirements/pip.txt b/requirements/pip.txt index a012442b..7b187b8d 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.2 +pip==24.2 # via -r requirements/pip.in -setuptools==70.2.0 +setuptools==72.1.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 78629673..bfe4fc3c 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -13,7 +13,7 @@ asgiref==3.8.1 # -r requirements/base.txt # django # django-cors-headers -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/base.txt # django @@ -22,11 +22,11 @@ beautifulsoup4==4.12.3 # via # -r requirements/base.txt # wagtail -boto3==1.34.141 +boto3==1.34.151 # via # -r requirements/base.txt # -r requirements/production.in -botocore==1.34.141 +botocore==1.34.151 # via # -r requirements/base.txt # boto3 @@ -48,7 +48,7 @@ click==8.1.7 # via # -r requirements/base.txt # edx-django-utils -cryptography==42.0.8 +cryptography==43.0.0 # via # -r requirements/base.txt # pyjwt @@ -148,7 +148,7 @@ edx-auth-backends==4.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -210,7 +210,7 @@ more-itertools==10.3.0 # inflect mysqlclient==2.2.4 # via -r requirements/base.txt -newrelic==9.11.0 +newrelic==9.12.0 # via # -r requirements/base.txt # edx-django-utils @@ -237,7 +237,7 @@ pillow==10.4.0 # -r requirements/base.txt # pillow-heif # wagtail -pillow-heif==0.17.0 +pillow-heif==0.18.0 # via # -r requirements/base.txt # willow @@ -321,7 +321,7 @@ slumber==0.7.1 # via # -r requirements/base.txt # edx-rest-api-client -social-auth-app-django==5.4.1 +social-auth-app-django==5.4.2 # via # -r requirements/base.txt # edx-auth-backends @@ -334,7 +334,7 @@ soupsieve==2.5 # via # -r requirements/base.txt # beautifulsoup4 -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/base.txt # django @@ -367,7 +367,7 @@ urllib3==1.26.19 # -r requirements/base.txt # botocore # requests -wagtail==6.1.2 +wagtail==6.1.3 # via -r requirements/base.txt willow[heif]==1.8.0 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 7d7bf9c9..8f4cfc62 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -13,12 +13,12 @@ asgiref==3.8.1 # -r requirements/test.txt # django # django-cors-headers -astroid==3.2.2 +astroid==3.2.4 # via # -r requirements/test.txt # pylint # pylint-celery -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django @@ -27,14 +27,14 @@ beautifulsoup4==4.12.3 # via # -r requirements/test.txt # wagtail -boto3==1.34.141 +boto3==1.34.151 # via -r requirements/test.txt -botocore==1.34.141 +botocore==1.34.151 # via # -r requirements/test.txt # boto3 # s3transfer -cachetools==5.3.3 +cachetools==5.4.0 # via # -r requirements/test.txt # tox @@ -74,11 +74,11 @@ colorama==0.4.6 # via # -r requirements/test.txt # tox -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.8 +cryptography==43.0.0 # via # -r requirements/test.txt # pyjwt @@ -188,14 +188,14 @@ edx-auth-backends==4.3.0 # via -r requirements/test.txt edx-django-release-util==1.4.0 # via -r requirements/test.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/test.txt # edx-drf-extensions # edx-rest-api-client edx-drf-extensions==10.3.0 # via -r requirements/test.txt -edx-lint==5.3.6 +edx-lint==5.3.7 # via # -r requirements/quality.in # -r requirements/test.txt @@ -209,7 +209,7 @@ et-xmlfile==1.1.0 # via # -r requirements/test.txt # openpyxl -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via # -r requirements/test.txt # pytest @@ -284,7 +284,7 @@ more-itertools==10.3.0 # inflect mysqlclient==2.2.4 # via -r requirements/test.txt -newrelic==9.11.0 +newrelic==9.12.0 # via # -r requirements/test.txt # edx-django-utils @@ -313,7 +313,7 @@ pillow==10.4.0 # -r requirements/test.txt # pillow-heif # wagtail -pillow-heif==0.17.0 +pillow-heif==0.18.0 # via # -r requirements/test.txt # willow @@ -348,7 +348,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==3.2.5 +pylint==3.2.6 # via # -r requirements/test.txt # edx-lint @@ -380,7 +380,7 @@ pyproject-api==1.7.1 # via # -r requirements/test.txt # tox -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/test.txt # pytest-cov @@ -449,7 +449,7 @@ slumber==0.7.1 # edx-rest-api-client snowballstemmer==2.2.0 # via pydocstyle -social-auth-app-django==5.4.1 +social-auth-app-django==5.4.2 # via # -r requirements/test.txt # edx-auth-backends @@ -462,7 +462,7 @@ soupsieve==2.5 # via # -r requirements/test.txt # beautifulsoup4 -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/test.txt # django @@ -488,7 +488,7 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.12.5 +tomlkit==0.13.0 # via # -r requirements/test.txt # pylint @@ -520,7 +520,7 @@ virtualenv==20.26.3 # via # -r requirements/test.txt # tox -wagtail==6.1.2 +wagtail==6.1.3 # via -r requirements/test.txt willow[heif]==1.8.0 # via diff --git a/requirements/test.txt b/requirements/test.txt index 0df63d08..59f2fbe2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -13,12 +13,13 @@ asgiref==3.8.1 # -r requirements/base.txt # django # django-cors-headers -astroid==3.2.2 +astroid==3.2.4 # via # pylint # pylint-celery -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/base.txt # django # djangorestframework @@ -26,14 +27,14 @@ beautifulsoup4==4.12.3 # via # -r requirements/base.txt # wagtail -boto3==1.34.141 +boto3==1.34.151 # via -r requirements/base.txt -botocore==1.34.141 +botocore==1.34.151 # via # -r requirements/base.txt # boto3 # s3transfer -cachetools==5.3.3 +cachetools==5.4.0 # via tox certifi==2024.7.4 # via @@ -65,11 +66,11 @@ code-annotations==1.8.0 # edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 # via # -r requirements/test.in # pytest-cov -cryptography==42.0.8 +cryptography==43.0.0 # via # -r requirements/base.txt # pyjwt @@ -176,14 +177,14 @@ edx-auth-backends==4.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.txt # edx-drf-extensions # edx-rest-api-client edx-drf-extensions==10.3.0 # via -r requirements/base.txt -edx-lint==5.3.6 +edx-lint==5.3.7 # via -r requirements/test.in edx-opaque-keys==2.10.0 # via @@ -197,7 +198,7 @@ et-xmlfile==1.1.0 # via # -r requirements/base.txt # openpyxl -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via pytest factory-boy==3.3.0 # via -r requirements/test.in @@ -261,7 +262,7 @@ more-itertools==10.3.0 # inflect mysqlclient==2.2.4 # via -r requirements/base.txt -newrelic==9.11.0 +newrelic==9.12.0 # via # -r requirements/base.txt # edx-django-utils @@ -290,7 +291,7 @@ pillow==10.4.0 # -r requirements/base.txt # pillow-heif # wagtail -pillow-heif==0.17.0 +pillow-heif==0.18.0 # via # -r requirements/base.txt # willow @@ -319,7 +320,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==3.2.5 +pylint==3.2.6 # via # edx-lint # pylint-celery @@ -343,7 +344,7 @@ pynacl==1.5.0 # edx-django-utils pyproject-api==1.7.1 # via tox -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/test.in # pytest-cov @@ -408,7 +409,7 @@ slumber==0.7.1 # via # -r requirements/base.txt # edx-rest-api-client -social-auth-app-django==5.4.1 +social-auth-app-django==5.4.2 # via # -r requirements/base.txt # edx-auth-backends @@ -421,7 +422,7 @@ soupsieve==2.5 # via # -r requirements/base.txt # beautifulsoup4 -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/base.txt # django @@ -444,7 +445,7 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.12.5 +tomlkit==0.13.0 # via pylint tox==4.16.0 # via -r requirements/test.in @@ -472,7 +473,7 @@ urllib3==1.26.19 # requests virtualenv==20.26.3 # via tox -wagtail==6.1.2 +wagtail==6.1.3 # via -r requirements/base.txt willow[heif]==1.8.0 # via diff --git a/tox.ini b/tox.ini index 1ad35f70..12d9490f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{42} +envlist = py{38,312}-django{42} skipsdist = true [pytest] @@ -8,6 +8,7 @@ testpaths = designer/apps [testenv] deps = + setuptools django42: -r requirements/django.txt -r {toxinidir}/requirements/test.txt commands = @@ -17,6 +18,7 @@ commands = allowlist_externals = make deps = + setuptools -r{toxinidir}/requirements/dev.txt commands = make quality @@ -25,6 +27,7 @@ commands = allowlist_externals = make deps = + setuptools -r{toxinidir}/requirements/dev.txt commands = make pii_check @@ -33,6 +36,7 @@ commands = allowlist_externals = make deps = + setuptools -r{toxinidir}/requirements/dev.txt commands = make check_keywords