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 and 3.12 support, drop Django 3.2 #383

Merged
merged 4 commits into from
Apr 17, 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
15 changes: 12 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,28 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
python-version: [3.8]
toxenv: [py38-django32, py38-django42, quality, translations-django32, translations-django42]
toxenv: [py38-django42, py311-django42, py312-django42, py38-quality, py311-quality, py312-quality, translations]

steps:
- name: checkout repo
uses: actions/checkout@v3
with:
submodules: recursive

- name: Extract the Python version from tox environment
run: |
if [[ "${{ matrix.toxenv }}" =~ py[0-9]+ ]]; then
PYTHON_VERSION=$(echo "${{ matrix.toxenv }}" | sed -E 's/py([0-9])([0-9]+).*/\1.\2/')
else
# Default version
PYTHON_VERSION=3.8
fi
echo "PYTHON_VERSION=$PYTHON_VERSION" >> $GITHUB_ENV

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

- name: Install translations dependencies
if: ${{ startsWith(matrix.toxenv, 'translations') }}
Expand Down
7 changes: 7 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ Drag and Drop XBlock changelog
Unreleased
---------------------------

Version 4.0.1 (2024-04-17)
--------------------------

* Add Python 3.11 support.
* Add Python 3.12 support.
* Drop Django 3.2 support.

Version 4.0.0 (2024-03-12)
--------------------------

Expand Down
2 changes: 1 addition & 1 deletion drag_and_drop_v2/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
""" Drag and Drop v2 XBlock """
from .drag_and_drop_v2 import DragAndDropBlock

__version__ = "4.0.0"
__version__ = "4.0.1"
38 changes: 21 additions & 17 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,21 @@
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
bleach[css]==6.1.0
# via -r requirements/base.in
boto3==1.34.49
boto3==1.34.85
# via fs-s3fs
botocore==1.34.49
botocore==1.34.85
# via
# boto3
# s3transfer
django==3.2.24
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# django-appconf
Expand All @@ -39,27 +43,27 @@ jmespath==1.0.1
# botocore
lazy==1.6
# via xblock
lxml==5.1.0
# via xblock
mako==1.3.2
lxml==4.9.4
# via
# -c requirements/constraints.txt
# xblock
mako==1.3.3
# via xblock
markupsafe==2.1.5
# via
# mako
# xblock
openedx-django-pyfs==3.5.0
openedx-django-pyfs==3.6.0
# via xblock
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# botocore
# xblock
pytz==2024.1
# via
# django
# xblock
# via xblock
pyyaml==6.0.1
# via xblock
s3transfer==0.10.0
s3transfer==0.10.1
# via boto3
simplejson==3.19.2
# via xblock
Expand All @@ -69,23 +73,23 @@ six==1.16.0
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.0
# via django
tinycss2==1.2.1
# via bleach
typing-extensions==4.10.0
typing-extensions==4.11.0
# via asgiref
urllib3==1.26.18
# via botocore
web-fragments==2.1.0
web-fragments==2.2.0
# via xblock
webencodings==0.5.1
# via
# bleach
# tinycss2
webob==1.8.7
# via xblock
xblock[django]==1.10.0
xblock[django]==3.1.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
10 changes: 5 additions & 5 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# 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.8
# via virtualenv
filelock==3.13.1
filelock==3.13.4
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/ci.in
virtualenv==20.25.1
virtualenv==20.25.2
# via tox
6 changes: 6 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

pylint==2.4.2

# For python greater than or equal to 3.9 backports.zoneinfo causing failures
backports.zoneinfo; python_version<"3.9"

# https://github.com/openedx/xblock-sdk/issues/347
lxml<5.0.0
Loading
Loading