Skip to content

Commit edde9a6

Browse files
committed
chore: add Python 3.11 and 3.12 support
1 parent 84352ea commit edde9a6

File tree

15 files changed

+147
-249
lines changed

15 files changed

+147
-249
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,19 @@ concurrency:
1515
jobs:
1616
tests:
1717
runs-on: ${{ matrix.os }}
18-
services:
19-
# Using SQLite3 for integration tests throws `django.db.utils.OperationalError: database table is locked: workbench_xblockstate`.
20-
mysql:
21-
image: mysql:8
22-
env:
23-
MYSQL_ROOT_PASSWORD: rootpw
24-
ports:
25-
- 3307:3306
2618
strategy:
2719
fail-fast: false
2820
matrix:
2921
os: [ubuntu-latest]
30-
python-version: [3.8]
31-
toxenv: [py38-django42, quality]
22+
python-version: [3.11, 3.12]
23+
toxenv: [django42, django52, quality]
3224

3325
steps:
3426
- name: checkout repo
35-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
3628

3729
- name: setup python
38-
uses: actions/setup-python@v4
30+
uses: actions/setup-python@v5
3931
with:
4032
python-version: ${{ matrix.python-version }}
4133

@@ -54,7 +46,7 @@ jobs:
5446
run: tox
5547

5648
- name: Run coverage
57-
if: matrix.python-version == '3.8' && matrix.toxenv == 'py38-django42'
49+
if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
5850
uses: codecov/codecov-action@v5
5951
with:
6052
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pypi-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010

1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: setup python
16-
uses: actions/setup-python@v4
16+
uses: actions/setup-python@v5
1717
with:
18-
python-version: 3.8
18+
python-version: 3.11
1919

2020
- name: Install Dependencies
2121
run: pip install -r requirements/pip.txt

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
*~
22
*.pyc
3-
/.coverage*
3+
.coverage
4+
.coverage.*
5+
coverage.xml
46
/xblock_problem_builder.egg-info
57
/workbench*
68
/dist

pylintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ disable=blacklisted-name,
365365
comprehension-escape,
366366
import-outside-toplevel,
367367
use-dict-literal,
368+
too-many-positional-arguments,
368369

369370
# Enable the message, report, category or checker with the given id(s). You can
370371
# either give multiple identifier separated by comma (,) or put this option

requirements/base.txt

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
55
# make upgrade
@@ -8,20 +8,18 @@ appdirs==1.4.4
88
# via fs
99
asgiref==3.8.1
1010
# via django
11-
backports-zoneinfo==0.2.1
12-
# via django
13-
boto3==1.37.38
11+
boto3==1.38.37
1412
# via fs-s3fs
15-
botocore==1.37.38
13+
botocore==1.38.37
1614
# via
1715
# boto3
1816
# s3transfer
19-
django==4.2.22
17+
django==4.2.23
2018
# via
2119
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
2220
# -r requirements/base.in
2321
# openedx-django-pyfs
24-
dnspython==2.6.1
22+
dnspython==2.7.0
2523
# via pymongo
2624
edx-opaque-keys==3.0.0
2725
# via -r requirements/base.in
@@ -44,15 +42,15 @@ mako==1.3.10
4442
# via
4543
# xblock
4644
# xblock-utils
47-
markupsafe==2.1.5
45+
markupsafe==3.0.2
4846
# via
4947
# mako
5048
# xblock
5149
openedx-django-pyfs==3.8.0
5250
# via xblock
5351
pbr==6.1.1
5452
# via stevedore
55-
pymongo==4.10.1
53+
pymongo==4.13.2
5654
# via edx-opaque-keys
5755
python-dateutil==2.9.0.post0
5856
# via
@@ -62,7 +60,7 @@ pytz==2025.2
6260
# via xblock
6361
pyyaml==6.0.2
6462
# via xblock
65-
s3transfer==0.11.5
63+
s3transfer==0.13.0
6664
# via boto3
6765
simplejson==3.20.1
6866
# via
@@ -75,13 +73,11 @@ six==1.17.0
7573
# python-dateutil
7674
sqlparse==0.5.3
7775
# via django
78-
stevedore==5.3.0
76+
stevedore==5.4.1
7977
# via edx-opaque-keys
80-
typing-extensions==4.13.2
81-
# via
82-
# asgiref
83-
# edx-opaque-keys
84-
urllib3==1.26.20
78+
typing-extensions==4.14.0
79+
# via edx-opaque-keys
80+
urllib3==2.2.3
8581
# via
8682
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
8783
# botocore
@@ -91,10 +87,8 @@ web-fragments==3.1.0
9187
# xblock-utils
9288
webob==1.8.9
9389
# via xblock
94-
xblock[django]==2.0.0
95-
# via
96-
# -c requirements/constraints.txt
97-
# xblock-utils
90+
xblock[django]==5.2.0
91+
# via xblock-utils
9892
xblock-utils==4.0.0
9993
# via -r requirements/base.in
10094

requirements/ci.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
55
# make upgrade
66
#
77
distlib==0.3.9
88
# via virtualenv
9-
filelock==3.16.1
9+
filelock==3.18.0
1010
# via
1111
# tox
1212
# virtualenv
1313
packaging==25.0
1414
# via
1515
# pyproject-api
1616
# tox
17-
platformdirs==4.3.6
17+
platformdirs==4.3.8
1818
# via
1919
# tox
2020
# virtualenv
21-
pluggy==1.5.0
21+
pluggy==1.6.0
2222
# via tox
2323
py==1.11.0
2424
# via tox
2525
six==1.17.0
2626
# via tox
27-
tomli==2.2.1
28-
# via
29-
# pyproject-api
30-
# tox
3127
tox==3.28.0
3228
# via
3329
# -r requirements/ci.in

requirements/constraints.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@
1212
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1313

1414
bok-choy==0.7.1
15-
XBlock[django]==2.0.0

0 commit comments

Comments
 (0)