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
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04
python-version: ['3.11']
toxenv: [quality, docs, django42]
python-version: ['3.11', '3.12']
toxenv: [quality, docs, django42, django52]
exclude:
- python-version: '3.12'
toxenv: 'django42'

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:

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

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.2.0 - 2025-10-14
**********************************************

Changed
=======

* **Ulmo Support**: Upgrade requirements base on edx-platform Ulmo release, update GitHub Workflows with new actions version.

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

Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
$(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
# Let tox control the Django version for tests
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp

grep -e "^django==" requirements/test.txt > requirements/django52.txt
sed '/^[dD]jango==/d;' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt

piptools: ## install pinned version of pip-compile and pip-sync
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.1.0'
__version__ = '2.2.0'
29 changes: 14 additions & 15 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
#
appdirs==1.4.4
# via fs
asgiref==3.8.1
asgiref==3.10.0
# via django
boto3==1.38.40
boto3==1.40.51
# via fs-s3fs
botocore==1.38.40
botocore==1.40.51
# via
# boto3
# s3transfer
django==4.2.23
django==5.2.7
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# django-appconf
# django-model-utils
# django-statici18n
Expand All @@ -32,13 +32,13 @@ django-model-utils==5.0.0
# via edx-submissions
django-statici18n==2.6.0
# via -r requirements/base.in
djangorestframework==3.16.0
djangorestframework==3.16.1
# via edx-submissions
edx-django-release-util==1.5.0
# via edx-submissions
edx-i18n-tools==1.9.0
# via -r requirements/base.in
edx-submissions==3.11.1
edx-submissions==3.12.0
# via -r requirements/base.in
fs==2.4.16
# via
Expand All @@ -51,23 +51,23 @@ jmespath==1.0.1
# via
# boto3
# botocore
jsonfield==3.1.0
jsonfield==3.2.0
# via edx-submissions
lazy==1.6
# via xblock
lxml[html-clean,html_clean]==5.4.0
lxml[html-clean]==6.0.2
# via
# edx-i18n-tools
# lxml-html-clean
# xblock
lxml-html-clean==0.4.2
lxml-html-clean==0.4.3
# via lxml
mako==1.3.10
# via
# -r requirements/base.in
# xblock
# xblock-utils
markupsafe==3.0.2
markupsafe==3.0.3
# via
# mako
# xblock
Expand All @@ -85,14 +85,14 @@ pytz==2025.2
# via
# edx-submissions
# xblock
pyyaml==6.0.2
pyyaml==6.0.3
# via
# edx-django-release-util
# edx-i18n-tools
# xblock
s3transfer==0.13.0
s3transfer==0.14.0
# via boto3
simplejson==3.20.1
simplejson==3.20.2
# via
# xblock
# xblock-utils
Expand All @@ -106,7 +106,6 @@ sqlparse==0.5.3
# via django
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==3.1.0
Expand Down
41 changes: 20 additions & 21 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,72 +6,72 @@
#
backports-tarfile==1.2.0
# via jaraco-context
certifi==2025.6.15
certifi==2025.10.5
# via requests
cffi==1.17.1
cffi==2.0.0
# via cryptography
charset-normalizer==3.4.2
charset-normalizer==3.4.4
# via requests
cryptography==45.0.4
cryptography==46.0.2
# via secretstorage
distlib==0.3.9
distlib==0.4.0
# via virtualenv
docutils==0.21.2
docutils==0.22.2
# via readme-renderer
filelock==3.18.0
filelock==3.20.0
# via
# tox
# virtualenv
id==1.5.0
# via twine
idna==3.10
idna==3.11
# via requests
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
jaraco-functools==4.3.0
# via keyring
jeepney==0.9.0
# via
# keyring
# secretstorage
keyring==25.6.0
# via twine
markdown-it-py==3.0.0
markdown-it-py==4.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
more-itertools==10.7.0
more-itertools==10.8.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.2.21
nh3==0.3.1
# via readme-renderer
packaging==25.0
# via
# pyproject-api
# tox
# twine
platformdirs==4.3.8
platformdirs==4.5.0
# via
# tox
# virtualenv
pluggy==1.6.0
# via tox
py==1.11.0
# via tox
pycparser==2.22
pycparser==2.23
# via cffi
pygments==2.19.1
pygments==2.19.2
# via
# readme-renderer
# rich
readme-renderer==44.0
# via twine
requests==2.32.4
requests==2.32.5
# via
# id
# requests-toolbelt
Expand All @@ -80,9 +80,9 @@ requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==14.0.0
rich==14.2.0
# via twine
secretstorage==3.3.3
secretstorage==3.4.0
# via keyring
six==1.17.0
# via tox
Expand All @@ -92,15 +92,14 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
twine==6.1.0
twine==6.2.0
# via -r requirements/ci.in
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.31.2
virtualenv==20.35.3
# via tox
zipp==3.23.0
# via importlib-metadata
15 changes: 13 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,19 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# using LTS django version
Django<6.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# NOTE: Pylint 4.x introduces changes in how the "ignore" and "ignore-patterns" options
# are parsed from setup.cfg and other configuration files. This causes Django migration
# modules (e.g., eox_tenant/migrations) to be linted even when explicitly ignored.
# Until we find a stable fix or plugin-based workaround, we keep Pylint pinned below 4.
pylint<4

# 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.
Expand Down
Loading