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 #146

Merged
merged 1 commit 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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Python CI

on:
Expand All @@ -15,11 +14,11 @@ jobs:
matrix:
python-version:
- '3.8'
- '3.11'
TOX_ENV:
- csslint
- eslint
- quality
- django32
- django42
steps:
- uses: actions/checkout@v2
Expand Down
28 changes: 15 additions & 13 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,32 @@
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
django==3.2.23
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
edx-codejail==3.3.3
# via -r requirements/base.in
fs==2.4.16
# via xblock
lxml==4.9.3
lxml==5.2.1
# via xblock
mako==1.3.0
mako==1.3.2
# via xblock
markupsafe==2.1.3
markupsafe==2.1.5
# via
# mako
# xblock
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via xblock
pytz==2024.1
# via xblock
pytz==2023.3.post1
# via
# django
# xblock
pyyaml==6.0.1
# via xblock
simplejson==3.19.2
Expand All @@ -41,13 +43,13 @@ six==1.16.0
# python-dateutil
sqlparse==0.4.4
# via django
typing-extensions==4.8.0
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.8.1
xblock==3.1.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 8 additions & 8 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via
# -r requirements/tox.txt
# tox
Expand All @@ -16,26 +16,26 @@ colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
distlib==0.3.7
distlib==0.3.8
# via
# -r requirements/tox.txt
# virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/tox.txt
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# -r requirements/tox.txt
# pyproject-api
# tox
platformdirs==3.11.0
platformdirs==4.2.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
pluggy==1.3.0
pluggy==1.4.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -48,9 +48,9 @@ tomli==2.0.1
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.11.3
tox==4.14.2
# via -r requirements/tox.txt
virtualenv==20.24.6
virtualenv==20.25.1
# via
# -r requirements/tox.txt
# tox
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 @@ -12,3 +12,6 @@
-c common_constraints.txt

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

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
6 changes: 3 additions & 3 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.41.3
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.3.1
pip==24.0
# via -r requirements/pip.in
setuptools==68.2.2
setuptools==69.2.0
# via -r requirements/pip.in
20 changes: 12 additions & 8 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,30 @@
#
# make upgrade
#
build==1.0.3
build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
# 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.3.0
pip-tools==7.4.1
# via -r requirements/pip_tools.in
pyproject-hooks==1.0.0
# via build
# via
# build
# pip-tools
tomli==2.0.1
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.41.3
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
42 changes: 23 additions & 19 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,22 @@ appdirs==1.4.4
# via
# -r requirements/base.txt
# fs
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements/base.txt
# django
astroid==3.0.1
astroid==3.1.0
# via pylint
coverage==7.3.2
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# django
coverage==7.4.4
# via -r requirements/test.txt
dill==0.3.7
dill==0.3.8
# via pylint
django==3.2.23
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
Expand All @@ -30,17 +35,17 @@ fs==2.4.16
# via
# -r requirements/base.txt
# xblock
isort==5.12.0
isort==5.13.2
# via pylint
lxml==4.9.3
lxml==5.2.1
# via
# -r requirements/base.txt
# xblock
mako==1.3.0
mako==1.3.2
# via
# -r requirements/base.txt
# xblock
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -r requirements/base.txt
# mako
Expand All @@ -51,24 +56,23 @@ pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==4.0.0
platformdirs==4.2.0
# via pylint
pycodestyle==2.11.1
# via -r requirements/quality.in
pylint==3.0.2
pylint==3.1.0
# via -r requirements/quality.in
pymongo==3.13.0
# via
# -r requirements/test.txt
# edx-opaque-keys
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# -r requirements/base.txt
# xblock
pytz==2023.3.post1
pytz==2024.1
# via
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand All @@ -88,31 +92,31 @@ sqlparse==0.4.4
# via
# -r requirements/base.txt
# django
stevedore==5.1.0
stevedore==5.2.0
# via
# -r requirements/test.txt
# edx-opaque-keys
tomli==2.0.1
# via pylint
tomlkit==0.12.2
tomlkit==0.12.4
# via pylint
typing-extensions==4.8.0
typing-extensions==4.10.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
# asgiref
# astroid
# edx-opaque-keys
# pylint
web-fragments==2.1.0
web-fragments==2.2.0
# via
# -r requirements/base.txt
# xblock
webob==1.8.7
# via
# -r requirements/base.txt
# xblock
xblock==1.8.1
xblock==3.1.0
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# make upgrade
#
coverage==7.3.2
coverage==7.4.4
# via -r requirements/test.in
edx-opaque-keys==2.5.1
# via -r requirements/test.in
pbr==6.0.0
# via stevedore
pymongo==3.13.0
# via edx-opaque-keys
stevedore==5.1.0
stevedore==5.2.0
# via edx-opaque-keys
typing-extensions==4.8.0
typing-extensions==4.10.0
# via edx-opaque-keys
16 changes: 8 additions & 8 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
platformdirs==3.11.0
platformdirs==4.2.0
# via
# tox
# virtualenv
pluggy==1.3.0
pluggy==1.4.0
# via tox
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.11.3
tox==4.14.2
# via -r requirements/tox.in
virtualenv==20.24.6
virtualenv==20.25.1
# via tox
Loading
Loading