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 #44

Merged
merged 41 commits into from
Jan 17, 2025
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9000ae7
chore: add py311 support
luisfelipec95 Jan 14, 2025
16d9e4b
chore: upgrade requirements
luisfelipec95 Jan 14, 2025
6eefd4a
docs: update readme
luisfelipec95 Jan 14, 2025
cea2e2e
chore: update workflows actions
luisfelipec95 Jan 14, 2025
8b831f0
chore: upgrade plugin version
luisfelipec95 Jan 14, 2025
8dce964
chore: add py311 support
luisfelipec95 Jan 14, 2025
a45f6c6
chore: python 3.8 support
luisfelipec95 Jan 15, 2025
4448de1
fix: setuptools==75.3.0
luisfelipec95 Jan 15, 2025
905366b
fix: docutils==0.20.1
luisfelipec95 Jan 15, 2025
afda558
fix: keyring==25.5.0
luisfelipec95 Jan 15, 2025
764729e
fix: more-itertools==10.5.0
luisfelipec95 Jan 15, 2025
27a6e19
fix: readme-renderer==43.0
luisfelipec95 Jan 15, 2025
75a0947
fix: zipp==3.20.2
luisfelipec95 Jan 15, 2025
0e99712
fix: astroid==3.2.4
luisfelipec95 Jan 15, 2025
ad783e6
fix: code-annotations==1.8.2
luisfelipec95 Jan 15, 2025
90a9074
fix: coverage==7.6.1
luisfelipec95 Jan 15, 2025
c39e56d
fix: dnspython==2.6.1
luisfelipec95 Jan 15, 2025
ab6be54
fix: edx-event-routing-backends==9.3.0
luisfelipec95 Jan 15, 2025
9c6eb37
fix: fastavro==1.9.7
luisfelipec95 Jan 15, 2025
e55d91c
fix: markupsafe==2.1.5
luisfelipec95 Jan 15, 2025
f822ec4
fix: openedx-events==9.14.1
luisfelipec95 Jan 15, 2025
f897a90
fix: openedx-filters==1.9.0
luisfelipec95 Jan 15, 2025
eecaaa0
fix: pytest-cov==5.0.0
luisfelipec95 Jan 15, 2025
b8332d1
fix: pylint==3.2.7
luisfelipec95 Jan 15, 2025
6788e84
fix: pylint-django==2.5.5
luisfelipec95 Jan 15, 2025
95b36de
fix: stevedore==5.3.0
luisfelipec95 Jan 15, 2025
6c9e678
fix: urllib3==2.2.3
luisfelipec95 Jan 15, 2025
f1e14ac
fix: botocore==1.35.93
luisfelipec95 Jan 15, 2025
4546c94
fix: botocore==1.34.101
luisfelipec95 Jan 15, 2025
b9ac30f
fix: edx-lint==5.3.4
luisfelipec95 Jan 15, 2025
1a16a2d
fix: upgrade requirements with python 3.8
luisfelipec95 Jan 16, 2025
5dcb2ac
chore: add backports.zoneinfo constraint
luisfelipec95 Jan 16, 2025
5b86f97
chore: add backports.zoneinfo constraint
luisfelipec95 Jan 16, 2025
900e5b3
fix: semicolon
luisfelipec95 Jan 16, 2025
baaf173
fix: edx_lint constraint
luisfelipec95 Jan 16, 2025
fbd8ee2
chore: support django 3.2
luisfelipec95 Jan 17, 2025
709a0b7
chore: version
luisfelipec95 Jan 17, 2025
e754948
docs: update compatibility notes
luisfelipec95 Jan 17, 2025
8b87c32
fix: constraint djangorestframework==3.15.1
luisfelipec95 Jan 17, 2025
7ab02af
fix: constraint djangorestframework==3.15.1
luisfelipec95 Jan 17, 2025
95ac115
docs: changelog
luisfelipec95 Jan 17, 2025
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
@@ -15,13 +15,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, django32, django40]
luisfelipec95 marked this conversation as resolved.
Show resolved Hide resolved
python-version: ['3.8', '3.11']
toxenv: [quality, django32, django42]
exclude:
- python-version: '3.11'
toxenv: django32

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 }}

6 changes: 3 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -14,6 +14,14 @@ Change Log
Unreleased
**********

0.10.0 - 2025-01-17
**********************************************

Added
=====

* Support for Python 3.11

0.9.1 - 2024-04-26
**********************************************

4 changes: 3 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -33,10 +33,12 @@ Compatibility Notes
+------------------+--------------+
| Redwood | >= 0.7.0 |
+------------------+--------------+
| Sumac | >= 0.10.0 |
+------------------+--------------+

The settings can be changed in ``filesmanager/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 versions.


Enabling the XBlock in a course
2 changes: 1 addition & 1 deletion filesmanager/__init__.py
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
Init for the FilesManagerXBlock package.
"""

__version__ = '0.9.1'
__version__ = '0.10.0'
142 changes: 79 additions & 63 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -4,70 +4,74 @@
#
# make upgrade
#
amqp==5.2.0
amqp==5.3.1
# via kombu
aniso8601==9.0.1
aniso8601==10.0.0
# via tincan
apache-libcloud==3.8.0
# via edx-event-routing-backends
appdirs==1.4.4
# via fs
asgiref==3.7.2
asgiref==3.8.1
# via django
attrs==23.2.0
async-timeout==5.0.1
# via redis
attrs==24.3.0
# via openedx-events
backports-zoneinfo[tzdata]==0.2.1
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
billiard==4.2.1
# via celery
boto3==1.34.53
boto3==1.36.0
# via fs-s3fs
botocore==1.34.53
botocore==1.36.0
# via
# boto3
# s3transfer
celery==5.3.6
celery==5.4.0
# via
# -r requirements/base.in
# edx-celeryutils
# event-tracking
certifi==2024.2.2
certifi==2024.12.14
# via requests
cffi==1.16.0
cffi==1.17.1
# via
# cryptography
# pynacl
charset-normalizer==3.3.2
charset-normalizer==3.4.1
# via requests
click==8.1.7
click==8.1.8
# via
# celery
# click-didyoumean
# click-plugins
# click-repl
# code-annotations
# edx-django-utils
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
code-annotations==1.6.0
code-annotations==1.8.2
# via edx-toggles
cryptography==42.0.5
cryptography==44.0.0
# via django-fernet-fields-v2
django==4.2.10
django==4.2.18
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# django-appconf
# django-config-models
# django-crum
# django-fernet-fields-v2
# django-model-utils
# django-redis
# django-statici18n
# django-waffle
# djangorestframework
@@ -83,47 +87,54 @@ django==4.2.10
# openedx-filters
django-appconf==1.0.6
# via django-statici18n
django-config-models==2.5.1
django-config-models==2.7.0
# via edx-event-routing-backends
django-crum==0.7.9
# via
# edx-django-utils
# edx-toggles
django-fernet-fields-v2==0.9
# via edx-event-routing-backends
django-model-utils==4.4.0
django-model-utils==5.0.0
# via edx-celeryutils
django-statici18n==2.4.0
django-redis==5.4.0
# via edx-event-routing-backends
django-statici18n==2.6.0
# via -r requirements/base.in
django-waffle==4.1.0
django-waffle==4.2.0
# via
# edx-django-utils
# edx-toggles
djangorestframework==3.14.0
djangorestframework==3.15.1
# via django-config-models
edx-celeryutils==1.2.5
dnspython==2.6.1
# via pymongo
edx-ccx-keys==2.0.2
# via openedx-events
edx-celeryutils==1.3.0
# via edx-event-routing-backends
edx-django-utils==5.10.1
edx-django-utils==7.1.0
# via
# django-config-models
# edx-toggles
# event-tracking
# openedx-events
edx-event-routing-backends==8.1.2
edx-event-routing-backends==9.3.0
# via -r requirements/base.in
edx-i18n-tools==1.3.0
edx-i18n-tools==1.6.3
# via -r requirements/base.in
edx-opaque-keys[django]==2.5.1
edx-opaque-keys[django]==2.11.0
# via
# -r requirements/base.in
# edx-ccx-keys
# openedx-events
edx-toggles==5.1.1
edx-toggles==5.2.0
# via
# edx-event-routing-backends
# event-tracking
event-tracking==2.3.0
event-tracking==3.0.0
# via edx-event-routing-backends
fastavro==1.9.4
fastavro==1.9.7
# via openedx-events
fasteners==0.19
# via edx-event-routing-backends
@@ -134,11 +145,11 @@ fs==2.4.16
# xblock
fs-s3fs==1.1.1
# via openedx-django-pyfs
idna==3.6
idna==3.10
# via requests
isodate==0.6.1
isodate==0.7.2
# via edx-event-routing-backends
jinja2==3.1.3
jinja2==3.1.5
# via code-annotations
jmespath==1.0.1
# via
@@ -148,15 +159,18 @@ jsonfield==3.1.0
# via
# edx-celeryutils
# edx-event-routing-backends
kombu==5.3.5
kombu==5.4.2
# via celery
lazy==1.6
# via xblock
lxml==5.1.0
lxml[html-clean,html_clean]==5.3.0
# via
# edx-i18n-tools
# lxml-html-clean
# xblock
mako==1.3.2
lxml-html-clean==0.4.1
# via lxml
mako==1.3.8
# via
# -r requirements/base.in
# xblock
@@ -166,72 +180,73 @@ markupsafe==2.1.5
# jinja2
# mako
# xblock
newrelic==9.7.0
newrelic==10.4.0
# via edx-django-utils
openedx-django-pyfs==3.5.0
openedx-django-pyfs==3.7.0
# via xblock
openedx-events==9.5.2
openedx-events==9.14.1
# via event-tracking
openedx-filters==1.6.0
openedx-filters==1.9.0
# via edx-event-routing-backends
path==16.10.0
path==16.16.0
# via edx-i18n-tools
pbr==6.0.0
pbr==6.1.0
# via stevedore
polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.43
prompt-toolkit==3.0.48
# via click-repl
psutil==5.9.8
psutil==6.1.1
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pymongo==3.13.0
pymongo==4.4.0
# via
# edx-opaque-keys
# event-tracking
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.9.0
python-dateutil==2.9.0.post0
# via
# botocore
# celery
# edx-event-routing-backends
# xblock
python-slugify==8.0.4
# via code-annotations
pytz==2024.1
pytz==2024.2
# via
# djangorestframework
# edx-event-routing-backends
# event-tracking
# tincan
# xblock
pyyaml==6.0.1
pyyaml==6.0.2
# via
# code-annotations
# edx-i18n-tools
# xblock
requests==2.31.0
redis==5.2.1
# via django-redis
requests==2.32.3
# via
# apache-libcloud
# edx-event-routing-backends
s3transfer==0.10.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-ccx-keys
# event-tracking
# fs
# fs-s3fs
# isodate
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.3
# via django
stevedore==5.2.0
stevedore==5.3.0
# via
# code-annotations
# edx-django-utils
@@ -242,17 +257,18 @@ tincan==1.0.0
# via
# -r requirements/base.in
# edx-event-routing-backends
typing-extensions==4.10.0
typing-extensions==4.12.2
# via
# asgiref
# edx-opaque-keys
# kombu
tzdata==2024.1
tzdata==2024.2
# via
# backports-zoneinfo
# celery
urllib3==1.26.18
urllib3==1.26.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# botocore
# requests
@@ -263,14 +279,14 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit
web-fragments==2.1.0
web-fragments==2.2.0
# via
# -r requirements/base.in
# xblock
# xblock-utils
webob==1.8.7
webob==1.8.9
# via xblock
xblock[django]==2.0.0
xblock[django]==5.1.0
# via
# -r requirements/base.in
# xblock-utils
72 changes: 42 additions & 30 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -4,83 +4,92 @@
#
# make upgrade
#
certifi==2024.2.2
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.2
charset-normalizer==3.4.1
# via requests
cryptography==42.0.5
cryptography==44.0.0
# via secretstorage
distlib==0.3.8
distlib==0.3.9
# via virtualenv
docutils==0.20.1
# via readme-renderer
filelock==3.13.1
filelock==3.16.1
# via
# tox
# virtualenv
idna==3.6
idna==3.10
# via requests
importlib-metadata==7.0.1
importlib-metadata==8.5.0
# via
# keyring
# twine
importlib-resources==6.1.2
importlib-resources==6.4.5
# via keyring
jaraco-classes==3.3.1
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.3.1
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.2.0
# via jaraco-classes
nh3==0.2.15
more-itertools==10.5.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.2.20
# via readme-renderer
packaging==23.2
packaging==24.2
# via
# pyproject-api
# tox
pkginfo==1.9.6
# twine
pkginfo==1.12.0
# via twine
platformdirs==4.2.0
platformdirs==4.3.6
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
py==1.11.0
# via tox
pycparser==2.21
pycparser==2.22
# via cffi
pygments==2.17.2
pygments==2.19.1
# via
# readme-renderer
# rich
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.7.1
rich==13.9.4
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
six==1.17.0
# via tox
tomli==2.0.1
tomli==2.2.1
# via
# pyproject-api
# tox
@@ -90,18 +99,21 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
twine==5.0.0
twine==6.0.1
# via -r requirements/ci.in
typing-extensions==4.10.0
# via rich
urllib3==1.26.18
typing-extensions==4.12.2
# via
# rich
# tox
urllib3==1.26.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# requests
# twine
virtualenv==20.25.1
virtualenv==20.29.0
# via tox
zipp==3.17.0
zipp==3.20.2
# via
# importlib-metadata
# importlib-resources
8 changes: 8 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -14,3 +14,11 @@
# 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

# djangorestframework 3.15.1 is the last version compatible with django 3.2
djangorestframework<3.15.2
237 changes: 139 additions & 98 deletions requirements/dev.txt

Large diffs are not rendered by default.

214 changes: 125 additions & 89 deletions requirements/doc.txt

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -4,28 +4,27 @@
#
# make upgrade
#
build==1.1.1
build==1.2.2.post1
# via pip-tools
click==8.1.7
click==8.1.8
# via pip-tools
importlib-metadata==7.0.1
importlib-metadata==8.5.0
# via build
packaging==23.2
packaging==24.2
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
pyproject-hooks==1.2.0
# via
# build
# pip-tools
tomli==2.0.1
tomli==2.2.1
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.45.1
# via pip-tools
zipp==3.17.0
zipp==3.20.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
10 changes: 6 additions & 4 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -4,11 +4,13 @@
#
# make upgrade
#
wheel==0.42.0
wheel==0.45.1
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.1
pip==24.2
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/pip.in
setuptools==75.3.0
# via -r requirements/pip.in
184 changes: 106 additions & 78 deletions requirements/quality.txt

Large diffs are not rendered by default.

168 changes: 98 additions & 70 deletions requirements/test.txt

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -161,10 +161,12 @@ def is_requirement(line):
'Development Status :: 3 - Alpha',
'Framework :: Django',
'Framework :: Django :: 3.2',
luisfelipec95 marked this conversation as resolved.
Show resolved Hide resolved
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.11',
],
)
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32,40}
envlist = py38-django{32,42}, py311-django{42}

[doc8]
; D001 = Line too long
@@ -37,7 +37,7 @@ norecursedirs = .* requirements site-packages
[testenv]
deps =
django32: Django>=3.2,<4.0
luisfelipec95 marked this conversation as resolved.
Show resolved Hide resolved
django40: Django>=4.0,<4.1
django42: Django>=4.2, <5.0
-r{toxinidir}/requirements/test.txt
commands =
python manage.py check