Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add python 3.11 support #162

Merged
merged 5 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django32, django42, quality, csslint, eslint, translations_validate]
python-version:
- '3.8'
- '3.11'
toxenv: [django42, quality, csslint, eslint, translations_validate]

steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## Version 4.1.0
* Added python 3.11 support. Dropped django32 support.

## Version 4.0.0

* Remove Transifex calls and bundled translation files for the OEP-58 proposal.
Expand Down
2 changes: 1 addition & 1 deletion freetextresponse/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
present in order for the student to receive credit.
"""

__version__ = "4.0.0"
__version__ = "4.1.0"
24 changes: 14 additions & 10 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,32 @@
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
django==3.2.24
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
fs==2.4.16
# via xblock
lxml==5.1.0
# via xblock
lxml==4.9.4
# via
# -c requirements/constraints.txt
# xblock
mako==1.3.2
# via xblock
markupsafe==2.1.5
# via
# mako
# xblock
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via xblock
pytz==2024.1
# via
# django
# xblock
# via xblock
pyyaml==6.0.1
# via xblock
simplejson==3.19.2
Expand All @@ -41,11 +45,11 @@ sqlparse==0.4.4
# via django
typing-extensions==4.10.0
# via asgiref
web-fragments==2.1.0
web-fragments==2.2.0
# via xblock
webob==1.8.7
# via xblock
xblock==1.10.0
xblock==3.1.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ distlib==0.3.8
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/tox.txt
# tox
# virtualenv
idna==3.6
# via requests
packaging==23.2
packaging==24.0
# via
# -r requirements/tox.txt
# pyproject-api
Expand All @@ -62,7 +62,7 @@ tomli==2.0.1
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/tox.txt
urllib3==2.2.1
# via requests
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
6 changes: 6 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@
-c common_constraints.txt

# TODO: Many pinned dependencies should be unpinned and/or moved to this constraints file.

# Adding pin to avoid conflicts.
lxml<5.0.0 # xblock-sdk

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 9 additions & 7 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
34 changes: 20 additions & 14 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,28 @@ arrow==1.3.0
# via
# -r requirements/test.txt
# cookiecutter
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
# django
astroid==3.1.0
# via pylint
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# django
binaryornot==0.4.4
# via
# -r requirements/test.txt
# cookiecutter
boto3==1.34.50
boto3==1.34.77
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.34.50
botocore==1.34.77
# via
# -r requirements/test.txt
# boto3
Expand All @@ -53,13 +59,13 @@ cookiecutter==2.6.0
# via
# -r requirements/test.txt
# xblock-sdk
coverage==7.4.3
coverage==7.4.4
# via -r requirements/test.txt
ddt==1.7.2
# via -r requirements/test.txt
dill==0.3.8
# via pylint
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -99,8 +105,9 @@ jmespath==1.0.1
# botocore
lazy==1.6
# via -r requirements/test.txt
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# xblock
Expand Down Expand Up @@ -151,7 +158,7 @@ pypng==0.20220715.0
# via
# -r requirements/test.txt
# xblock-sdk
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -166,7 +173,6 @@ pytz==2024.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand All @@ -179,11 +185,11 @@ requests==2.31.0
# -r requirements/test.txt
# cookiecutter
# xblock-sdk
rich==13.7.0
rich==13.7.1
# via
# -r requirements/test.txt
# cookiecutter
s3transfer==0.10.0
s3transfer==0.10.1
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -217,7 +223,7 @@ tomli==2.0.1
# via pylint
tomlkit==0.12.4
# via pylint
types-python-dateutil==2.8.19.20240106
types-python-dateutil==2.9.0.20240316
# via
# -r requirements/test.txt
# arrow
Expand All @@ -235,7 +241,7 @@ urllib3==1.26.18
# -r requirements/test.txt
# botocore
# requests
web-fragments==2.1.0
web-fragments==2.2.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -247,12 +253,12 @@ webob==1.8.7
# -r requirements/test.txt
# xblock
# xblock-sdk
xblock==1.10.0
xblock==3.1.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
# xblock-sdk
xblock-sdk==0.7.0
xblock-sdk==0.10.0
# via -r requirements/test.txt

# The following packages are considered to be unsafe in a requirements file:
Expand Down
Loading
Loading