From 68c7852f96c213356b5e6a7a58a04ef31ff927d1 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Fri, 16 Feb 2024 15:56:29 +0500 Subject: [PATCH 1/2] feat: add support for python 3.12 --- .github/workflows/ci.yml | 3 +-- CHANGELOG.rst | 2 ++ edx_rest_framework_extensions/__init__.py | 2 +- setup.py | 4 +--- tox.ini | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8eed950b..7f1fd04d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,10 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] + python-version: ['3.8', '3.12'] toxenv: [ quality, docs, - django32-drflatest, django42-drflatest ] diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e60c7e44..75a6ad5c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,6 +12,8 @@ Change Log Unreleased ---------- +* Add support for python 3.12 + [10.2.0] - 2024-01-26 --------------------- diff --git a/edx_rest_framework_extensions/__init__.py b/edx_rest_framework_extensions/__init__.py index ab4ed884..64d32560 100644 --- a/edx_rest_framework_extensions/__init__.py +++ b/edx_rest_framework_extensions/__init__.py @@ -1,3 +1,3 @@ """ edx Django REST Framework extensions. """ -__version__ = '10.2.0' # pragma: no cover +__version__ = '10.3.0' # pragma: no cover diff --git a/setup.py b/setup.py index 84f1be0e..ac48558a 100644 --- a/setup.py +++ b/setup.py @@ -109,10 +109,8 @@ def get_version(*file_paths): 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.12', 'Framework :: Django', - 'Framework :: Django :: 3.2', - 'Framework :: Django :: 4.0', - 'Framework :: Django :: 4.1', 'Framework :: Django :: 4.2', ], packages=find_packages(exclude=["tests"]), diff --git a/tox.ini b/tox.ini index d8e929f4..63975dde 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,11 @@ [tox] -envlist = py38-django{32,40,41,42}-drf{312,latest}, quality, docs +envlist = py{38,312}-django{32,40,41,42}-drf{312,latest}, quality, docs [testenv] setenv = PYTHONPATH = {toxinidir} deps = -r{toxinidir}/requirements/test.txt - django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 drf314: djangorestframework<3.15.0 drflatest: djangorestframework From 234e8f435e49227215e416613c72930a2935fda5 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 8 Apr 2024 16:06:02 +0500 Subject: [PATCH 2/2] fix: run make upgrade --- requirements/base.txt | 6 +++--- requirements/dev.txt | 10 +++++----- requirements/docs.txt | 2 +- requirements/test.txt | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 91ff0b32..89078359 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -44,7 +44,7 @@ djangorestframework==3.15.1 # drf-jwt drf-jwt==1.19.2 # via -r requirements/base.in -edx-django-utils==5.11.0 +edx-django-utils==5.12.0 # via -r requirements/base.in edx-opaque-keys==2.5.1 # via -r requirements/base.in @@ -56,7 +56,7 @@ pbr==6.0.0 # via stevedore psutil==5.9.8 # via edx-django-utils -pycparser==2.21 +pycparser==2.22 # via cffi pyjwt[crypto]==2.8.0 # via @@ -76,7 +76,7 @@ stevedore==5.2.0 # via # edx-django-utils # edx-opaque-keys -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via # asgiref # edx-opaque-keys diff --git a/requirements/dev.txt b/requirements/dev.txt index ecd0f8d4..0ae4e840 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -76,7 +76,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.7.0 +code-annotations==1.8.0 # via # -r requirements/test.txt # edx-lint @@ -137,7 +137,7 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # -r requirements/test.txt -edx-django-utils==5.11.0 +edx-django-utils==5.12.0 # via # -r requirements/base.txt # -r requirements/test.txt @@ -153,7 +153,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==2.12.0 # via -r requirements/test.txt -faker==24.4.0 +faker==24.7.1 # via # -r requirements/test.txt # factory-boy @@ -239,7 +239,7 @@ psutil==5.9.8 # edx-django-utils pycodestyle==2.11.1 # via -r requirements/test.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # -r requirements/test.txt @@ -403,7 +403,7 @@ tomlkit==0.12.4 # pylint tox==4.14.2 # via -r requirements/test.txt -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via # -r requirements/base.txt # -r requirements/docs.txt diff --git a/requirements/docs.txt b/requirements/docs.txt index 15bf0ef4..e1c71a34 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -86,7 +86,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via # -c requirements/test.txt # pydata-sphinx-theme diff --git a/requirements/test.txt b/requirements/test.txt index 37987dc6..0b2a789d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -44,7 +44,7 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.7.0 +code-annotations==1.8.0 # via edx-lint colorama==0.4.6 # via tox @@ -83,7 +83,7 @@ django-waffle==4.1.0 # drf-jwt drf-jwt==1.19.2 # via -r requirements/base.txt -edx-django-utils==5.11.0 +edx-django-utils==5.12.0 # via -r requirements/base.txt edx-lint==5.3.6 # via -r requirements/test.in @@ -93,7 +93,7 @@ exceptiongroup==1.2.0 # via pytest factory-boy==2.12.0 # via -r requirements/test.in -faker==24.4.0 +faker==24.7.1 # via factory-boy filelock==3.13.3 # via @@ -145,7 +145,7 @@ psutil==5.9.8 # edx-django-utils pycodestyle==2.11.1 # via -r requirements/test.in -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -222,7 +222,7 @@ tomlkit==0.12.4 # via pylint tox==4.14.2 # via -r requirements/test.in -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via # -r requirements/base.txt # asgiref