Skip to content

Commit

Permalink
feat: add python 311 support
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Mar 28, 2024
1 parent 50a2ab6 commit 34ad0df
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 94 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [
quality,
docs,
django32-drflatest,
django42-drflatest
]
python-version: ['3.8', '3.11']
toxenv: [quality, docs, django42-drflatest]

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Change Log
Unreleased
----------

[10.3.0] - 2024-03-29
---------------------

* Added Support for ``Python 3.11``
* Dropped support for ``Django<4.2``

[10.2.0] - 2024-01-26
---------------------

Expand Down
2 changes: 1 addition & 1 deletion edx_rest_framework_extensions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" edx Django REST Framework extensions. """

__version__ = '10.2.0' # pragma: no cover
__version__ = '10.3.0' # pragma: no cover
23 changes: 12 additions & 11 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
#
# 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
# djangorestframework
certifi==2024.2.2
# via requests
cffi==1.16.0
Expand All @@ -16,9 +21,9 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via edx-django-utils
cryptography==42.0.4
cryptography==42.0.5
# via pyjwt
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -33,19 +38,19 @@ django-waffle==4.1.0
# via
# -r requirements/base.in
# edx-django-utils
djangorestframework==3.14.0
djangorestframework==3.15.1
# via
# -r requirements/base.in
# drf-jwt
drf-jwt==1.19.2
# via -r requirements/base.in
edx-django-utils==5.10.1
edx-django-utils==5.11.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via -r requirements/base.in
idna==3.6
# via requests
newrelic==9.7.0
newrelic==9.8.0
# via edx-django-utils
pbr==6.0.0
# via stevedore
Expand All @@ -61,10 +66,6 @@ pymongo==3.13.0
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
pytz==2024.1
# via
# django
# djangorestframework
requests==2.31.0
# via -r requirements/base.in
semantic-version==2.10.0
Expand All @@ -75,7 +76,7 @@ stevedore==5.2.0
# via
# edx-django-utils
# edx-opaque-keys
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# asgiref
# edx-opaque-keys
Expand Down
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# 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
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
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
# which is causing make upgrade job to fail due to conflicts
# Constraint can be removed once sphinx_rtd_theme>=1.1.1 is available on PyPI
sphinx==5.3.0

# For python greater than or equal to 3.9 backports.zoneinfo causing failures
backports.zoneinfo; python_version<'3.9'
58 changes: 31 additions & 27 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ alabaster==0.7.13
# via
# -r requirements/docs.txt
# sphinx
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
# django
astroid==3.0.3
astroid==3.1.0
# via
# -r requirements/test.txt
# pylint
Expand All @@ -27,11 +27,18 @@ babel==2.14.0
# -r requirements/docs.txt
# pydata-sphinx-theme
# sphinx
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# django
# djangorestframework
beautifulsoup4==4.12.3
# via
# -r requirements/docs.txt
# pydata-sphinx-theme
cachetools==5.3.2
cachetools==5.3.3
# via
# -r requirements/test.txt
# tox
Expand Down Expand Up @@ -69,24 +76,24 @@ 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
colorama==0.4.6
# via
# -r requirements/test.txt
# tox
coverage[toml]==7.4.2
coverage[toml]==7.4.4
# via
# -r requirements/test.txt
# pytest-cov
cryptography==42.0.4
cryptography==42.0.5
# via
# -r requirements/base.txt
# -r requirements/test.txt
# pyjwt
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.txt
dill==0.3.8
# via
Expand All @@ -96,7 +103,7 @@ distlib==0.3.8
# via
# -r requirements/test.txt
# virtualenv
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
Expand All @@ -116,7 +123,7 @@ django-waffle==4.1.0
# -r requirements/base.txt
# -r requirements/test.txt
# edx-django-utils
djangorestframework==3.14.0
djangorestframework==3.15.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -130,7 +137,7 @@ drf-jwt==1.19.2
# via
# -r requirements/base.txt
# -r requirements/test.txt
edx-django-utils==5.10.1
edx-django-utils==5.11.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -146,11 +153,11 @@ exceptiongroup==1.2.0
# pytest
factory-boy==2.12.0
# via -r requirements/test.txt
faker==23.2.1
faker==24.4.0
# via
# -r requirements/test.txt
# factory-boy
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/test.txt
# tox
Expand All @@ -167,8 +174,9 @@ imagesize==1.4.1
# via
# -r requirements/docs.txt
# sphinx
importlib-metadata==7.0.1
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/docs.txt
# sphinx
iniconfig==2.0.0
Expand All @@ -194,12 +202,12 @@ mccabe==0.7.0
# via
# -r requirements/test.txt
# pylint
newrelic==9.7.0
newrelic==9.8.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
# edx-django-utils
packaging==23.2
packaging==24.0
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -251,7 +259,7 @@ pyjwt[crypto]==2.8.0
# -r requirements/base.txt
# -r requirements/test.txt
# drf-jwt
pylint==3.0.3
pylint==3.1.0
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -285,16 +293,16 @@ pyproject-api==1.6.1
# via
# -r requirements/test.txt
# tox
pytest==8.0.1
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
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# -r requirements/test.txt
# faker
Expand All @@ -304,12 +312,8 @@ python-slugify==8.0.4
# code-annotations
pytz==2024.1
# via
# -r requirements/base.txt
# -r requirements/docs.txt
# -r requirements/test.txt
# babel
# django
# djangorestframework
pyyaml==6.0.1
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -393,13 +397,13 @@ tomli==2.0.1
# pyproject-api
# pytest
# tox
tomlkit==0.12.3
tomlkit==0.12.4
# via
# -r requirements/test.txt
# pylint
tox==4.13.0
tox==4.14.2
# via -r requirements/test.txt
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/base.txt
# -r requirements/docs.txt
Expand All @@ -420,7 +424,7 @@ virtualenv==20.25.1
# via
# -r requirements/test.txt
# tox
zipp==3.17.0
zipp==3.18.1
# via
# -r requirements/docs.txt
# importlib-metadata
16 changes: 8 additions & 8 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ idna==3.6
# requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.1
# via sphinx
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# sphinx
jinja2==3.1.3
# via
# -c requirements/test.txt
Expand All @@ -42,7 +44,7 @@ markupsafe==2.1.5
# via
# -c requirements/test.txt
# jinja2
packaging==23.2
packaging==24.0
# via
# -c requirements/test.txt
# pydata-sphinx-theme
Expand All @@ -55,9 +57,7 @@ pygments==2.17.2
# pydata-sphinx-theme
# sphinx
pytz==2024.1
# via
# -c requirements/test.txt
# babel
# via babel
requests==2.31.0
# via
# -c requirements/test.txt
Expand Down Expand Up @@ -86,13 +86,13 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -c requirements/test.txt
# pydata-sphinx-theme
urllib3==2.2.1
# via
# -c requirements/test.txt
# requests
zipp==3.17.0
zipp==3.18.1
# via importlib-metadata

0 comments on commit 34ad0df

Please sign in to comment.