Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04
python-version: ['3.11']
toxenv: [quality, docs, django42]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:

push:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ Change Log
Unreleased
**********

2.1.0 - 2025-06-22
**********************************************

Changed
=======

* **Teak Support**: Upgrade requirements based on edx-platform Teak release, update GitHub Actions workflows to use the `ubuntu-22.04` runner image.

2.0.0 - 2025-02-04
**********************************************

Expand Down
4 changes: 3 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ Compatibility Notes
+------------------+------------------+
| Sumac | >= 1.1.0 |
+------------------+------------------+
| Teak | >= 2.1.0 |
+------------------+------------------+

To ensure better maintainability and performance, **Python 3.11 or newer** is now required.

The settings can be changed in ``mindmap/settings/common.py`` or, for example, in tutor configurations.

**NOTE**: the current ``common.py`` works with Open edX Palm, Quince, Redwood and Sumac versions.
**NOTE**: the current ``common.py`` works with Open edX releases >= Redwood.


Enabling the XBlock in a course
Expand Down
2 changes: 1 addition & 1 deletion mindmap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

from .mindmap import MindMapXBlock

__version__ = '2.0.0'
__version__ = '2.1.0'
40 changes: 19 additions & 21 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ appdirs==1.4.4
# via fs
asgiref==3.8.1
# via django
boto3==1.36.12
boto3==1.38.40
# via fs-s3fs
botocore==1.36.12
botocore==1.38.40
# via
# boto3
# s3transfer
django==4.2.18
django==4.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# django-appconf
Expand All @@ -26,21 +26,19 @@ django==4.2.18
# edx-submissions
# jsonfield
# openedx-django-pyfs
django-appconf==1.0.6
django-appconf==1.1.0
# via django-statici18n
django-model-utils==5.0.0
# via edx-submissions
django-statici18n==2.6.0
# via -r requirements/base.in
djangorestframework==3.15.1
# via
# -c requirements/constraints.txt
# edx-submissions
edx-django-release-util==1.4.0
djangorestframework==3.16.0
# via edx-submissions
edx-django-release-util==1.5.0
# via edx-submissions
edx-i18n-tools==1.6.3
edx-i18n-tools==1.9.0
# via -r requirements/base.in
edx-submissions==3.8.5
edx-submissions==3.11.1
# via -r requirements/base.in
fs==2.4.16
# via
Expand All @@ -57,14 +55,14 @@ jsonfield==3.1.0
# via edx-submissions
lazy==1.6
# via xblock
lxml[html-clean,html_clean]==5.3.0
lxml[html-clean,html_clean]==5.4.0
# via
# edx-i18n-tools
# lxml-html-clean
# xblock
lxml-html-clean==0.4.1
lxml-html-clean==0.4.2
# via lxml
mako==1.3.9
mako==1.3.10
# via
# -r requirements/base.in
# xblock
Expand All @@ -73,7 +71,7 @@ markupsafe==3.0.2
# via
# mako
# xblock
openedx-django-pyfs==3.7.0
openedx-django-pyfs==3.8.0
# via xblock
path==16.16.0
# via edx-i18n-tools
Expand All @@ -83,7 +81,7 @@ python-dateutil==2.9.0.post0
# via
# botocore
# xblock
pytz==2025.1
pytz==2025.2
# via
# edx-submissions
# xblock
Expand All @@ -92,9 +90,9 @@ pyyaml==6.0.2
# edx-django-release-util
# edx-i18n-tools
# xblock
s3transfer==0.11.2
s3transfer==0.13.0
# via boto3
simplejson==3.19.3
simplejson==3.20.1
# via
# xblock
# xblock-utils
Expand All @@ -106,18 +104,18 @@ six==1.17.0
# python-dateutil
sqlparse==0.5.3
# via django
urllib3==1.26.20
urllib3==2.2.3
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# botocore
web-fragments==2.2.0
web-fragments==3.1.0
# via
# xblock
# xblock-utils
webob==1.8.9
# via xblock
xblock[django]==5.1.1
xblock[django]==5.2.0
# via
# -r requirements/base.in
# xblock-utils
Expand Down
32 changes: 16 additions & 16 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@
#
backports-tarfile==1.2.0
# via jaraco-context
certifi==2025.1.31
certifi==2025.6.15
# via requests
cffi==1.17.1
# via cryptography
charset-normalizer==3.4.1
charset-normalizer==3.4.2
# via requests
cryptography==44.0.0
cryptography==45.0.4
# via secretstorage
distlib==0.3.9
# via virtualenv
docutils==0.21.2
# via readme-renderer
filelock==3.17.0
filelock==3.18.0
# via
# tox
# virtualenv
id==1.5.0
# via twine
idna==3.10
# via requests
importlib-metadata==8.6.1
importlib-metadata==8.7.0
# via keyring
jaraco-classes==3.4.0
# via keyring
jaraco-context==6.0.1
# via keyring
jaraco-functools==4.1.0
# via keyring
jeepney==0.8.0
jeepney==0.9.0
# via
# keyring
# secretstorage
Expand All @@ -44,22 +44,22 @@ markdown-it-py==3.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
more-itertools==10.6.0
more-itertools==10.7.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.2.20
nh3==0.2.21
# via readme-renderer
packaging==24.2
packaging==25.0
# via
# pyproject-api
# tox
# twine
platformdirs==4.3.6
platformdirs==4.3.8
# via
# tox
# virtualenv
pluggy==1.5.0
pluggy==1.6.0
# via tox
py==1.11.0
# via tox
Expand All @@ -71,7 +71,7 @@ pygments==2.19.1
# rich
readme-renderer==44.0
# via twine
requests==2.32.3
requests==2.32.4
# via
# id
# requests-toolbelt
Expand All @@ -80,7 +80,7 @@ requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==13.9.4
rich==14.0.0
# via twine
secretstorage==3.3.3
# via keyring
Expand All @@ -94,13 +94,13 @@ tox-battery==0.6.2
# via -r requirements/ci.in
twine==6.1.0
# via -r requirements/ci.in
urllib3==1.26.20
urllib3==2.2.3
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# requests
# twine
virtualenv==20.29.1
virtualenv==20.31.2
# via tox
zipp==3.21.0
zipp==3.23.0
# via importlib-metadata
6 changes: 4 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# urllib3>=2.0.0 conflicts with zipp so we're using the same version as in edx-platform
urllib3<2.0.0
# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do the xblocks have problems if we remove this constraint?


Loading