Merge pull request #57 from eduNEXT/jipm/support-py312

chore: add support for Python 3.12 and Django 5.2

Author: jignaciopm

.github/workflows/ci.yml

@@ -19,9 +19,9 @@ jobs:
         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 }}
 

CHANGELOG.rst

@@ -14,6 +14,14 @@ 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
 **********************************************
 

Makefile

@@ -46,6 +46,10 @@ upgrade: ## update the pip requirements files to use the latest releases satisfy
 	pip-compile --rebuild --upgrade -o requirements/ci.txt requirements/ci.in
 	pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in
 
+	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
+
 test-python: clean ## Run test suite.
 	$(TOX) pip install -r requirements/base.txt --exists-action w
 	$(TOX) coverage run --source="." -m pytest ./flow_control_xblock

README.rst

@@ -19,6 +19,8 @@ Compatibility Notes
 +------------------+--------------+
 | Teak             | >= 2.1.0     |
 +------------------+--------------+
+| Teak             | >= 2.2.0     |
++------------------+--------------+
 
 Enabling in Studio
 ------------------

flow_control/__init__.py

@@ -2,4 +2,4 @@
 Init for main Flow-Control XBlock
 """
 from .flow import FlowCheckPointXblock
-__version__ = '2.1.0'
+__version__ = '2.2.0'

requirements/base.txt

@@ -6,19 +6,19 @@
 #
 appdirs==1.4.4
     # via fs
-asgiref==3.8.1
+asgiref==3.10.0
     # via django
-boto3==1.38.41
+boto3==1.40.51
     # via fs-s3fs
-botocore==1.38.41
+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
     #   openedx-django-pyfs
-dnspython==2.7.0
+dnspython==2.8.0
     # via pymongo
 edx-opaque-keys[django]==3.0.0
     # via -r requirements/base.in
@@ -35,33 +35,31 @@ jmespath==1.0.1
     #   botocore
 lazy==1.6
     # via xblock
-lxml==5.4.0
+lxml==6.0.2
     # via xblock
 mako==1.3.10
     # via
     #   xblock
     #   xblock-utils
-markupsafe==3.0.2
+markupsafe==3.0.3
     # via
     #   mako
     #   xblock
 openedx-django-pyfs==3.8.0
     # via xblock
-pbr==6.1.1
-    # via stevedore
-pymongo==4.13.2
+pymongo==4.15.3
     # via edx-opaque-keys
 python-dateutil==2.9.0.post0
     # via
     #   botocore
     #   xblock
 pytz==2025.2
     # via xblock
-pyyaml==6.0.2
+pyyaml==6.0.3
     # via xblock
-s3transfer==0.13.0
+s3transfer==0.14.0
     # via boto3
-simplejson==3.20.1
+simplejson==3.20.2
     # via
     #   xblock
     #   xblock-utils
@@ -72,14 +70,12 @@ six==1.17.0
     #   python-dateutil
 sqlparse==0.5.3
     # via django
-stevedore==5.4.1
+stevedore==5.5.0
     # via edx-opaque-keys
-typing-extensions==4.14.0
+typing-extensions==4.15.0
     # via edx-opaque-keys
-urllib3==2.2.3
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   botocore
+urllib3==2.5.0
+    # via botocore
 web-fragments==3.1.0
     # via
     #   xblock

requirements/ci.txt

@@ -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
@@ -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
@@ -92,14 +92,13 @@ 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
+urllib3==2.5.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   requests
     #   twine
-virtualenv==20.31.2
+virtualenv==20.35.3
     # via tox
 zipp==3.23.0
     # via importlib-metadata

requirements/constraints.txt

@@ -9,5 +9,16 @@
 # 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