Skip to content

Commit

Permalink
chore!: upgrade to Python 3.11 and Django 4.2
Browse files Browse the repository at this point in the history
Drop support for Python 3.8 and Django 3.2.

BREAKING CHANGE: No longer compatible with releases older than Quince.
  • Loading branch information
Agrendalath committed Mar 2, 2025
1 parent 653861f commit b50c1a4
Show file tree
Hide file tree
Showing 14 changed files with 237 additions and 339 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
python-version: [3.8]
toxenv: [django32-nutmeg, django32-latest, django42-latest, quality, pii_check]
os: [ubuntu-latest]
python-version: [3.11, 3.12]
toxenv: [django42, quality, pii_check]

steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -40,8 +40,8 @@ jobs:
run: tox

- name: Run coverage
if: matrix.python-version == '3.8' && matrix.toxenv == 'django32-nutmeg'
uses: codecov/codecov-action@v3
if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: unittests
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
jobs:

push:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ pip install https://github.com/open-craft/xblock-html-completable
```
You may specify the `-e` flag if you intend to develop on the repo.

Note that as of version 1.0.0, Python 2.7 is no longer supported. The current minimum Python version is 3.8.

To enable this block type, add `completable_html5` to course's advanced module list.

## Development
Expand Down
2 changes: 1 addition & 1 deletion completable_html_xblock/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

from .html import CompletableHTML5XBlock

__version__ = "1.2.2"
__version__ = "2.0.0"
2 changes: 1 addition & 1 deletion completable_html_xblock/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from xblock.completable import CompletableXBlockMixin
from xblock.core import XBlock
from xblock.fields import Scope, String
from xblockutils.resources import ResourceLoader
from xblock.utils.resources import ResourceLoader

log = logging.getLogger(__name__)
xblock_loader = ResourceLoader(__name__)
Expand Down
71 changes: 29 additions & 42 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
bleach[css]==6.1.0
bleach[css]==6.2.0
# via html-xblock
boto3==1.34.49
boto3==1.37.4
# via fs-s3fs
botocore==1.34.49
botocore==1.37.4
# via
# boto3
# s3transfer
django==3.2.24
django==4.2.19
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# html-xblock
Expand All @@ -28,71 +28,58 @@ fs==2.4.16
# xblock
fs-s3fs==1.1.1
# via openedx-django-pyfs
html-xblock==1.3.6
html-xblock==2.0.0
# via -r requirements/base.in
jmespath==1.0.1
# via
# boto3
# botocore
lazy==1.6
# via xblock
lxml==5.1.0
lxml==5.3.1
# via xblock
mako==1.3.2
# via
# xblock
# xblock-utils
markupsafe==2.1.5
mako==1.3.9
# via xblock
markupsafe==3.0.2
# via
# mako
# xblock
openedx-django-pyfs==3.5.0
openedx-django-pyfs==3.7.0
# via xblock
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# botocore
# xblock
pytz==2024.1
# via
# django
# xblock
pyyaml==6.0.1
pytz==2025.1
# via xblock
pyyaml==6.0.2
# via xblock
s3transfer==0.10.0
s3transfer==0.11.3
# via boto3
simplejson==3.19.2
# via
# xblock
# xblock-utils
six==1.16.0
simplejson==3.20.1
# via xblock
six==1.17.0
# via
# bleach
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.3
# via django
tinycss2==1.2.1
tinycss2==1.4.0
# via bleach
typing-extensions==4.10.0
# via asgiref
urllib3==1.26.18
# via botocore
web-fragments==2.1.0
urllib3==2.2.3
# via
# xblock
# xblock-utils
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# botocore
web-fragments==2.2.0
# via xblock
webencodings==0.5.1
# via
# bleach
# tinycss2
webob==1.8.7
webob==1.8.9
# via xblock
xblock[django]==1.10.0
# via
# html-xblock
# xblock-utils
xblock-utils==4.0.0
xblock[django]==5.1.2
# via html-xblock

# The following packages are considered to be unsafe in a requirements file:
Expand Down
20 changes: 8 additions & 12 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
distlib==0.3.8
distlib==0.3.9
# via virtualenv
filelock==3.13.1
filelock==3.17.0
# via
# tox
# virtualenv
packaging==23.2
packaging==24.2
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.3.6
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
py==1.11.0
# via tox
six==1.16.0
six==1.17.0
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==3.28.0
# via
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
virtualenv==20.25.1
virtualenv==20.29.2
# via tox
Loading

0 comments on commit b50c1a4

Please sign in to comment.