Skip to content

Commit b3d1ce4

Browse files
committed
chore!: upgrade to Python 3.11 and Django 4.2
Drop support for Python 3.8 and Django 3.2. BREAKING CHANGE: No longer compatible with releases older than Quince.
1 parent 653861f commit b3d1ce4

File tree

14 files changed

+237
-339
lines changed

14 files changed

+237
-339
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-20.04]
22-
python-version: [3.8]
23-
toxenv: [django32-nutmeg, django32-latest, django42-latest, quality, pii_check]
21+
os: [ubuntu-latest]
22+
python-version: [3.11, 3.12]
23+
toxenv: [django42, quality, pii_check]
2424

2525
steps:
2626
- name: checkout repo
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: setup python
30-
uses: actions/setup-python@v4
30+
uses: actions/setup-python@v5
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333

@@ -40,8 +40,8 @@ jobs:
4040
run: tox
4141

4242
- name: Run coverage
43-
if: matrix.python-version == '3.8' && matrix.toxenv == 'django32-nutmeg'
44-
uses: codecov/codecov-action@v3
43+
if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
44+
uses: codecov/codecov-action@v5
4545
with:
4646
token: ${{ secrets.CODECOV_TOKEN }}
4747
flags: unittests

.github/workflows/pypi-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77
jobs:
88

99
push:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
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 pip
2121
run: pip install -r requirements/pip.txt

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ pip install https://github.com/open-craft/xblock-html-completable
1818
```
1919
You may specify the `-e` flag if you intend to develop on the repo.
2020

21-
Note that as of version 1.0.0, Python 2.7 is no longer supported. The current minimum Python version is 3.8.
22-
2321
To enable this block type, add `completable_html5` to course's advanced module list.
2422

2523
## Development

completable_html_xblock/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
from .html import CompletableHTML5XBlock
66

7-
__version__ = "1.2.2"
7+
__version__ = "2.0.0"

completable_html_xblock/html.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from xblock.completable import CompletableXBlockMixin
1111
from xblock.core import XBlock
1212
from xblock.fields import Scope, String
13-
from xblockutils.resources import ResourceLoader
13+
from xblock.utils.resources import ResourceLoader
1414

1515
log = logging.getLogger(__name__)
1616
xblock_loader = ResourceLoader(__name__)

requirements/base.txt

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
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
appdirs==1.4.4
88
# via fs
9-
asgiref==3.7.2
9+
asgiref==3.8.1
1010
# via django
11-
bleach[css]==6.1.0
11+
bleach[css]==6.2.0
1212
# via html-xblock
13-
boto3==1.34.49
13+
boto3==1.37.4
1414
# via fs-s3fs
15-
botocore==1.34.49
15+
botocore==1.37.4
1616
# via
1717
# boto3
1818
# s3transfer
19-
django==3.2.24
19+
django==4.2.19
2020
# via
2121
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
2222
# html-xblock
@@ -28,71 +28,58 @@ fs==2.4.16
2828
# xblock
2929
fs-s3fs==1.1.1
3030
# via openedx-django-pyfs
31-
html-xblock==1.3.6
31+
html-xblock==2.0.0
3232
# via -r requirements/base.in
3333
jmespath==1.0.1
3434
# via
3535
# boto3
3636
# botocore
3737
lazy==1.6
3838
# via xblock
39-
lxml==5.1.0
39+
lxml==5.3.1
4040
# via xblock
41-
mako==1.3.2
42-
# via
43-
# xblock
44-
# xblock-utils
45-
markupsafe==2.1.5
41+
mako==1.3.9
42+
# via xblock
43+
markupsafe==3.0.2
4644
# via
4745
# mako
4846
# xblock
49-
openedx-django-pyfs==3.5.0
47+
openedx-django-pyfs==3.7.0
5048
# via xblock
51-
python-dateutil==2.8.2
49+
python-dateutil==2.9.0.post0
5250
# via
5351
# botocore
5452
# xblock
55-
pytz==2024.1
56-
# via
57-
# django
58-
# xblock
59-
pyyaml==6.0.1
53+
pytz==2025.1
54+
# via xblock
55+
pyyaml==6.0.2
6056
# via xblock
61-
s3transfer==0.10.0
57+
s3transfer==0.11.3
6258
# via boto3
63-
simplejson==3.19.2
64-
# via
65-
# xblock
66-
# xblock-utils
67-
six==1.16.0
59+
simplejson==3.20.1
60+
# via xblock
61+
six==1.17.0
6862
# via
69-
# bleach
7063
# fs
7164
# fs-s3fs
7265
# python-dateutil
73-
sqlparse==0.4.4
66+
sqlparse==0.5.3
7467
# via django
75-
tinycss2==1.2.1
68+
tinycss2==1.4.0
7669
# via bleach
77-
typing-extensions==4.10.0
78-
# via asgiref
79-
urllib3==1.26.18
80-
# via botocore
81-
web-fragments==2.1.0
70+
urllib3==2.2.3
8271
# via
83-
# xblock
84-
# xblock-utils
72+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
73+
# botocore
74+
web-fragments==2.2.0
75+
# via xblock
8576
webencodings==0.5.1
8677
# via
8778
# bleach
8879
# tinycss2
89-
webob==1.8.7
80+
webob==1.8.9
9081
# via xblock
91-
xblock[django]==1.10.0
92-
# via
93-
# html-xblock
94-
# xblock-utils
95-
xblock-utils==4.0.0
82+
xblock[django]==5.1.2
9683
# via html-xblock
9784

9885
# The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
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
#
7-
distlib==0.3.8
7+
distlib==0.3.9
88
# via virtualenv
9-
filelock==3.13.1
9+
filelock==3.17.0
1010
# via
1111
# tox
1212
# virtualenv
13-
packaging==23.2
13+
packaging==24.2
1414
# via
1515
# pyproject-api
1616
# tox
17-
platformdirs==4.2.0
17+
platformdirs==4.3.6
1818
# via
1919
# tox
2020
# virtualenv
21-
pluggy==1.4.0
21+
pluggy==1.5.0
2222
# via tox
2323
py==1.11.0
2424
# via tox
25-
six==1.16.0
25+
six==1.17.0
2626
# via tox
27-
tomli==2.0.1
28-
# via
29-
# pyproject-api
30-
# tox
3127
tox==3.28.0
3228
# via
3329
# -r requirements/ci.in
3430
# tox-battery
3531
tox-battery==0.6.2
3632
# via -r requirements/ci.in
37-
virtualenv==20.25.1
33+
virtualenv==20.29.2
3834
# via tox

0 commit comments

Comments
 (0)