Skip to content

Commit

Permalink
Adds support for python 3.12 (#352)
Browse files Browse the repository at this point in the history
* chore: Adds support for python 3.12
  • Loading branch information
farhan authored Feb 29, 2024
1 parent 4950ee9 commit 09ed9f0
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django32, django42]
python-version: ['3.8', '3.12']
toxenv: [django42]
steps:
- uses: actions/checkout@v2

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Change history for XBlock SDK

These are notable changes in XBlock.

0.8.0
-----
* Added support for python 3.12
* Dropped support for django 3.2


0.7.0
-----
* Added support for Django 4.2
Expand Down
5 changes: 3 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ jmespath==1.0.1
# botocore
lazy==1.6
# via xblock
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# xblock
mako==1.3.2
Expand Down Expand Up @@ -111,7 +112,7 @@ text-unidecode==1.3
# via python-slugify
types-python-dateutil==2.8.19.20240106
# via arrow
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# asgiref
# rich
Expand Down
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

# Common constraints for edx repos
-c common_constraints.txt

lxml<5.0.0
11 changes: 6 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ asgiref==3.7.2
# -r requirements/base.txt
# -r requirements/test.txt
# django
astroid==3.0.3
astroid==3.1.0
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -88,7 +88,7 @@ coverage[toml]==7.4.3
# -r requirements/test.in
# -r requirements/test.txt
# pytest-cov
ddt==1.7.1
ddt==1.7.2
# via
# -r requirements/test.in
# -r requirements/test.txt
Expand Down Expand Up @@ -158,8 +158,9 @@ lazy==1.6
# -r requirements/test.txt
# acid-xblock
# xblock
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 @@ -226,7 +227,7 @@ pygments==2.17.2
# -r requirements/base.txt
# -r requirements/test.txt
# rich
pylint==3.0.4
pylint==3.1.0
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -353,7 +354,7 @@ types-python-dateutil==2.8.19.20240106
# -r requirements/base.txt
# -r requirements/test.txt
# arrow
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down
11 changes: 6 additions & 5 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ asgiref==3.7.2
# via
# -r requirements/test.txt
# django
astroid==3.0.3
astroid==3.1.0
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -73,7 +73,7 @@ coverage[toml]==7.4.3
# via
# -r requirements/test.txt
# pytest-cov
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.txt
dill==0.3.8
# via pylint
Expand Down Expand Up @@ -134,8 +134,9 @@ lazy==1.6
# -r requirements/test.txt
# acid-xblock
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# xblock
mako==1.3.2
Expand Down Expand Up @@ -193,7 +194,7 @@ pygments==2.17.2
# via
# -r requirements/test.txt
# rich
pylint==3.0.4
pylint==3.1.0
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -298,7 +299,7 @@ types-python-dateutil==2.8.19.20240106
# via
# -r requirements/test.txt
# arrow
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/test.txt
# asgiref
Expand Down
7 changes: 4 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ coverage[toml]==7.4.3
# via
# -r requirements/test.in
# pytest-cov
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.in
distlib==0.3.8
# via virtualenv
Expand Down Expand Up @@ -102,8 +102,9 @@ lazy==1.6
# -r requirements/base.txt
# acid-xblock
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# xblock
mako==1.3.2
Expand Down Expand Up @@ -226,7 +227,7 @@ types-python-dateutil==2.8.19.20240106
# via
# -r requirements/base.txt
# arrow
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/base.txt
# asgiref
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ def get_version(*file_paths):
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.12',
],
tests_require=load_requirements('requirements/test.txt'),
entry_points={
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32,42},quality
envlist = py{38,312}-django{42},quality

[pycodestyle]
exclude = .git,.tox,migrations
Expand All @@ -13,8 +13,7 @@ norecursedirs = .* doc bin prototype screenshots requirements
[testenv]
allowlist_externals =
make
deps =
django32: Django>=3.2,<4.0
deps =
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
passenv =
Expand Down
2 changes: 1 addition & 1 deletion workbench/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Provide a djangoapp for XBlock development
"""

__version__ = '0.7.1'
__version__ = '0.8.0'

0 comments on commit 09ed9f0

Please sign in to comment.