From 7f09ecbca93f6eea2a86a9574db1e9a0924a552c Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 1 Apr 2024 19:46:16 +0500 Subject: [PATCH] build: running tests using python 3.11 (#297) * build: running tests using python 3.11 and 3.12 * feat: Update setup.py * feat: Update tox.ini --------- Co-authored-by: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Co-authored-by: Feanil Patel --- .github/workflows/ci.yml | 4 +-- CHANGELOG.rst | 11 ++++++-- auth_backends/__init__.py | 2 +- requirements/base.txt | 14 +++++----- requirements/ci.txt | 4 +-- requirements/common_constraints.txt | 11 +++++++- requirements/constraints.txt | 4 +++ requirements/dev.txt | 42 +++++++++++++++-------------- requirements/pip-tools.txt | 16 ++++++----- requirements/pip.txt | 4 +-- requirements/test.txt | 29 ++++++++++---------- setup.py | 5 ++-- tox.ini | 3 +-- 13 files changed, 88 insertions(+), 61 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 168f1d2..8a96f06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [quality, django32, django42, check_keywords] + python-version: ['3.8', '3.11', '3.12'] + toxenv: [quality, django42, check_keywords] steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b408741..30a3826 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,11 +14,18 @@ Unreleased * +Added +~~~~~~~ + +[4.3.0] - 2024-04-01 +-------------------- + +* Added support for python3.11 and 3.12 +* Dropped django 3.2 support. + [4.2.0] - 2023-08-03 -------------------- -Added -~~~~~~~ * Added support for Django 4.2 [4.1.0] - 2022-01-28 diff --git a/auth_backends/__init__.py b/auth_backends/__init__.py index d0016c4..d6fe7f9 100644 --- a/auth_backends/__init__.py +++ b/auth_backends/__init__.py @@ -3,4 +3,4 @@ These package is designed to be used primarily with Open edX Django projects, but should be compatible with non-edX projects as well. """ -__version__ = '4.2.0' # pragma: no cover +__version__ = '4.3.0' # pragma: no cover diff --git a/requirements/base.txt b/requirements/base.txt index 380073b..e62b946 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,8 +4,12 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # django certifi==2024.2.2 # via requests cffi==1.16.0 @@ -20,7 +24,7 @@ defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -31,7 +35,7 @@ oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -pycparser==2.21 +pycparser==2.22 # via cffi pyjwt[crypto]==2.8.0 # via @@ -39,13 +43,11 @@ pyjwt[crypto]==2.8.0 # social-auth-core python3-openid==3.2.0 # via social-auth-core -pytz==2024.1 - # via django requests==2.31.0 # via # requests-oauthlib # social-auth-core -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via social-auth-core six==1.16.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index c8b65c2..5e50065 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,11 +6,11 @@ # distlib==0.3.8 # via virtualenv -filelock==3.13.1 +filelock==3.13.3 # via # tox # virtualenv -packaging==23.2 +packaging==24.0 # via tox platformdirs==4.2.0 # via virtualenv diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 15aafb2..e3bf8ea 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,7 +13,7 @@ # using LTS django version -Django<4.0 +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 @@ -21,3 +21,12 @@ 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 + +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 1b874c0..c8e7566 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -13,3 +13,7 @@ # 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 + + +# 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 cf90fd0..c754e4b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,7 +8,7 @@ argparse==1.4.0 # via # -r requirements/test.txt # unittest2 -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django @@ -17,7 +17,12 @@ astroid==3.1.0 # -r requirements/test.txt # pylint # pylint-celery -build==1.0.3 +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # django +build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -45,11 +50,11 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/test.txt # edx-lint -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov @@ -72,13 +77,13 @@ distlib==0.3.8 # -r requirements/ci.txt # -r requirements/test.txt # virtualenv -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/test.txt # edx-django-release-util # social-auth-app-django -edx-django-release-util==1.3.0 +edx-django-release-util==1.4.0 # via -r requirements/test.txt edx-lint==5.3.6 # via -r requirements/test.txt @@ -86,7 +91,7 @@ exceptiongroup==1.2.0 # via # -r requirements/test.txt # pytest -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -98,8 +103,9 @@ idna==3.6 # via # -r requirements/test.txt # requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/pip-tools.txt # build iniconfig==2.0.0 @@ -131,7 +137,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==24.0 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -143,7 +149,7 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.txt platformdirs==4.2.0 # via @@ -164,7 +170,7 @@ py==1.11.0 # tox pycodestyle==2.11.1 # via -r requirements/test.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi @@ -199,12 +205,12 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.0.2 +pytest==8.1.1 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.txt pytest-django==4.8.0 # via -r requirements/test.txt @@ -216,10 +222,6 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2024.1 - # via - # -r requirements/test.txt - # django pyyaml==6.0.1 # via # -r requirements/test.txt @@ -230,7 +232,7 @@ requests==2.31.0 # -r requirements/test.txt # requests-oauthlib # social-auth-core -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via # -r requirements/test.txt # social-auth-core @@ -302,11 +304,11 @@ virtualenv==20.25.1 # -r requirements/ci.txt # -r requirements/test.txt # tox -wheel==0.42.0 +wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d9..6401f54 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,15 +4,17 @@ # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build +packaging==24.0 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via @@ -23,9 +25,9 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 6665603..cf44902 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.1 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 2df66a1..2eee0ad 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,7 +6,7 @@ # argparse==1.4.0 # via unittest2 -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django @@ -14,6 +14,11 @@ astroid==3.1.0 # via # pylint # pylint-celery +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/base.txt + # django certifi==2024.2.2 # via # -r requirements/base.txt @@ -33,9 +38,9 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint -coverage[toml]==7.4.3 +coverage[toml]==7.4.4 # via # -r requirements/test.in # pytest-cov @@ -58,13 +63,13 @@ distlib==0.3.8 # -r requirements/base.txt # edx-django-release-util # social-auth-app-django -edx-django-release-util==1.3.0 +edx-django-release-util==1.4.0 # via -r requirements/test.in edx-lint==5.3.6 # via -r requirements/test.in exceptiongroup==1.2.0 # via pytest -filelock==3.13.1 +filelock==3.13.3 # via # tox # virtualenv @@ -91,7 +96,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==24.0 # via # pytest # tox @@ -109,7 +114,7 @@ py==1.11.0 # via tox pycodestyle==2.11.1 # via -r requirements/test.in -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -133,11 +138,11 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pytest==8.0.2 +pytest==8.1.1 # via # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in pytest-django==4.8.0 # via -r requirements/test.in @@ -147,10 +152,6 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2024.1 - # via - # -r requirements/base.txt - # django pyyaml==6.0.1 # via # code-annotations @@ -160,7 +161,7 @@ requests==2.31.0 # -r requirements/base.txt # requests-oauthlib # social-auth-core -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 # via # -r requirements/base.txt # social-auth-core diff --git a/setup.py b/setup.py index 9db7ba5..e5fd363 100644 --- a/setup.py +++ b/setup.py @@ -106,9 +106,10 @@ def get_version(*file_paths): 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Framework :: Django', - 'Framework :: Django :: 3.2', - 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.2', 'Topic :: Internet', ], keywords='authentication edx', diff --git a/tox.ini b/tox.ini index bf771d5..943fd83 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,11 @@ [tox] -envlist = py38-django{32,42},quality +envlist = py{38,311,312}-django{42},quality [pycodestyle] max-line-length = 120 [testenv] deps = - django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt commands =