From fac0436dda5cad4f46a0666d8f8121e35ab9ec93 Mon Sep 17 00:00:00 2001 From: Shadi Naif Date: Mon, 18 Mar 2024 21:55:15 +0300 Subject: [PATCH 01/10] feat!: remove Transifex calls for FC-0012 - OEP-58 (#445) --- .tx/config | 9 ------- CHANGELOG.rst | 8 +++++++ README.rst | 11 --------- lti_consumer/__init__.py | 2 +- lti_consumer/conf/locale/config.yaml | 11 --------- lti_consumer/lti_xblock.py | 35 ++++++++++++---------------- 6 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 .tx/config diff --git a/.tx/config b/.tx/config deleted file mode 100644 index 15bc669f..00000000 --- a/.tx/config +++ /dev/null @@ -1,9 +0,0 @@ -[main] -host = https://www.transifex.com - -[o:open-edx:p:xblocks:r:lti-consumer] -file_filter = lti_consumer/translations//LC_MESSAGES/text.po -source_file = lti_consumer/translations/en/LC_MESSAGES/text.po -source_lang = en -type = PO - diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 37d1839b..14423aba 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,6 +15,14 @@ Please See the `releases tab `_ and run this command while -inside project root directory: - -.. code:: bash - - $ tx pull -f --mode=reviewed - Further Development Info ------------------------ diff --git a/lti_consumer/__init__.py b/lti_consumer/__init__.py index cd9ee742..0ba711e2 100644 --- a/lti_consumer/__init__.py +++ b/lti_consumer/__init__.py @@ -4,4 +4,4 @@ from .apps import LTIConsumerApp from .lti_xblock import LtiConsumerXBlock -__version__ = '9.8.3' +__version__ = '9.9.0' diff --git a/lti_consumer/conf/locale/config.yaml b/lti_consumer/conf/locale/config.yaml index 19ef2783..cc218b26 100644 --- a/lti_consumer/conf/locale/config.yaml +++ b/lti_consumer/conf/locale/config.yaml @@ -2,17 +2,6 @@ locales: - en # English - Source Language - - ar # Arabic - - es_419 # Spanish (Latin America) - - fr # French - - he # Hebrew - - hi # Hindi - - ja_JP # Japanese (Japan) - - ko_KR # Korean (Korea) - - pt_BR # Portuguese (Brazil) - - pt_PT # Portuguese (Portugal) - - ru # Russian - - zh_CN # Chinese (China) # Directories we don't search for strings. ignore_dirs: diff --git a/lti_consumer/lti_xblock.py b/lti_consumer/lti_xblock.py index bf18b4b2..08789041 100644 --- a/lti_consumer/lti_xblock.py +++ b/lti_consumer/lti_xblock.py @@ -55,11 +55,10 @@ import urllib.parse from collections import namedtuple from importlib import import_module -import pkg_resources import bleach from django.conf import settings -from django.utils import timezone, translation +from django.utils import timezone from web_fragments.fragment import Fragment from webob import Response @@ -257,6 +256,7 @@ class LtiConsumerXBlock(StudioEditableXBlockMixin, XBlock): """ block_settings_key = 'lti_consumer' + i18n_js_namespace = 'XBlockLtiConsumerI18N' display_name = String( display_name=_("Display Name"), @@ -662,20 +662,15 @@ def workbench_scenarios(): ] return scenarios - @staticmethod - def _get_statici18n_js_url(loader): # pragma: no cover - """ - Returns the Javascript translation file for the currently selected language, if any found by - `pkg_resources` - """ - lang_code = translation.get_language() - if not lang_code: - return None - text_js = 'public/js/translations/{lang_code}/text.js' - country_code = lang_code.split('-')[0] - for code in (translation.to_locale(lang_code), lang_code, country_code): - if pkg_resources.resource_exists(loader.module_name, text_js.format(lang_code=code)): - return text_js.format(lang_code=code) + def _get_statici18n_js_url(self): + """ + Return the JavaScript translation file provided by the XBlockI18NService. + """ + if i18n_service := self.runtime.service(self, 'i18n'): + if url_getter_func := getattr(i18n_service, 'get_javascript_i18n_catalog_url', None): + if javascript_url := url_getter_func(self): + return javascript_url + return None def validate_field_data(self, validation, data): @@ -1197,9 +1192,9 @@ def author_view(self, context): ) fragment.add_css(loader.load_unicode('static/css/student.css')) fragment.add_javascript(loader.load_unicode('static/js/xblock_lti_consumer.js')) - statici18n_js_url = self._get_statici18n_js_url(loader) + statici18n_js_url = self._get_statici18n_js_url() if statici18n_js_url: - fragment.add_javascript_url(self.runtime.local_resource_url(self, statici18n_js_url)) + fragment.add_javascript_url(statici18n_js_url) fragment.initialize_js('LtiConsumerXBlock') return fragment @@ -1224,9 +1219,9 @@ def student_view(self, context): fragment.add_content(loader.render_mako_template('/templates/html/student.html', context)) fragment.add_css(loader.load_unicode('static/css/student.css')) fragment.add_javascript(loader.load_unicode('static/js/xblock_lti_consumer.js')) - statici18n_js_url = self._get_statici18n_js_url(loader) + statici18n_js_url = self._get_statici18n_js_url() if statici18n_js_url: - fragment.add_javascript_url(self.runtime.local_resource_url(self, statici18n_js_url)) + fragment.add_javascript_url(statici18n_js_url) fragment.initialize_js('LtiConsumerXBlock') return fragment From 2423cf63585d9b00bb126912e4ec617070155c0c Mon Sep 17 00:00:00 2001 From: Jeremy Ristau Date: Sun, 24 Mar 2024 21:58:22 -0400 Subject: [PATCH 02/10] chore: update repo maintainer --- catalog-info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 183747bb..c6888cb6 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -16,5 +16,5 @@ metadata: spec: type: XBlock lifecycle: production - owner: masters-devs-cosmonauts + owner: ~ subcomponentOf: LTI From 83fa9e017db28b018af6e731ca0595230d0dafab Mon Sep 17 00:00:00 2001 From: Zachary Hancock Date: Wed, 3 Apr 2024 09:53:18 -0400 Subject: [PATCH 03/10] chore: remove cosmo team from requirements email (#462) --- .github/workflows/upgrade-python-requirements.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 86840239..f3b19999 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -18,8 +18,6 @@ jobs: # optional parameters below; fill in if you'd like github or email notifications # user_reviewers: "" # team_reviewers: "" - email_address: "cosmonauts-requirements-update@2u-internal.opsgenie.net" - send_success_notification: true secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} From 5876a95ed8c63c089ff7ecf8d0ed6f4b6231b45e Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Fri, 23 Feb 2024 07:37:39 -0500 Subject: [PATCH 04/10] feat: add python 3.11 support --- .github/workflows/ci.yml | 6 +- CHANGELOG.rst | 7 +- Makefile | 4 - lti_consumer/__init__.py | 2 +- requirements/base.txt | 53 ++++++------- requirements/ci.txt | 111 ++++++++++++++++------------ requirements/common_constraints.txt | 11 ++- requirements/constraints.txt | 4 + requirements/dev.txt | 53 ++++++------- requirements/django.txt | 2 +- requirements/pip.txt | 4 +- requirements/pip_tools.txt | 16 ++-- requirements/quality.txt | 69 +++++++++-------- requirements/test.txt | 97 ++++++++++++++---------- requirements/tox.txt | 10 +-- tox.ini | 15 ++-- 16 files changed, 262 insertions(+), 202 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 717b86df..113ab5ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,10 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [py38-django32, py38-django42, quality] + python-version: + - '3.8' + - '3.11' + toxenv: [django42, quality] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 14423aba..0789674c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,9 +15,12 @@ Please See the `releases tab requirements/django.txt - sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp - mv requirements/test.tmp requirements/test.txt ## Localization targets diff --git a/lti_consumer/__init__.py b/lti_consumer/__init__.py index 0ba711e2..62bcf216 100644 --- a/lti_consumer/__init__.py +++ b/lti_consumer/__init__.py @@ -4,4 +4,4 @@ from .apps import LTIConsumerApp from .lti_xblock import LtiConsumerXBlock -__version__ = '9.9.0' +__version__ = '9.10.0' diff --git a/requirements/base.txt b/requirements/base.txt index 4d7b8b60..ae8318d0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,15 +6,20 @@ # appdirs==1.4.4 # via fs -asgiref==3.7.2 +asgiref==3.8.1 # via django attrs==23.2.0 # via -r requirements/base.in +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # django + # djangorestframework bleach==6.1.0 # via -r requirements/base.in -boto3==1.34.45 +boto3==1.34.83 # via fs-s3fs -botocore==1.34.45 +botocore==1.34.83 # via # boto3 # s3transfer @@ -26,7 +31,7 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via edx-django-utils -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -43,21 +48,21 @@ django==3.2.24 # openedx-filters django-appconf==1.0.6 # via django-statici18n -django-config-models==2.5.1 +django-config-models==2.7.0 # via -r requirements/base.in django-crum==0.7.9 # via edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/base.in django-statici18n==2.4.0 # via -r requirements/base.in django-waffle==4.1.0 # via edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via django-config-models edx-ccx-keys==1.2.1 # via -r requirements/base.in -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via django-config-models edx-opaque-keys[django]==2.5.1 # via @@ -70,9 +75,9 @@ fs==2.4.16 # xblock fs-s3fs==1.1.1 # via openedx-django-pyfs -future==0.18.3 +future==1.0.0 # via pyjwkest -idna==3.6 +idna==3.7 # via requests jmespath==1.0.1 # via @@ -82,11 +87,12 @@ jsonfield==3.1.0 # via -r requirements/base.in lazy==1.6 # via -r requirements/base.in -lxml==5.1.0 +lxml==4.9.4 # via + # -c requirements/constraints.txt # -r requirements/base.in # xblock -mako==1.3.2 +mako==1.3.3 # via # -r requirements/base.in # xblock @@ -94,11 +100,11 @@ markupsafe==2.1.5 # via # mako # xblock -newrelic==9.6.0 +newrelic==9.8.0 # via edx-django-utils oauthlib==3.2.2 # via -r requirements/base.in -openedx-django-pyfs==3.5.0 +openedx-django-pyfs==3.6.0 # via -r requirements/base.in openedx-filters==1.6.0 # via -r requirements/base.in @@ -106,7 +112,7 @@ pbr==6.0.0 # via stevedore psutil==5.9.8 # via edx-django-utils -pycparser==2.21 +pycparser==2.22 # via cffi pycryptodomex==3.20.0 # via @@ -118,20 +124,17 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # xblock pytz==2024.1 - # via - # django - # djangorestframework - # xblock + # via xblock pyyaml==6.0.1 # via xblock requests==2.31.0 # via pyjwkest -s3transfer==0.10.0 +s3transfer==0.10.1 # via boto3 simplejson==3.19.2 # via xblock @@ -145,11 +148,11 @@ six==1.16.0 # python-dateutil sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via # edx-django-utils # edx-opaque-keys -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # asgiref # edx-opaque-keys @@ -158,13 +161,13 @@ urllib3==1.26.18 # -c requirements/constraints.txt # botocore # requests -web-fragments==2.1.0 +web-fragments==2.2.0 # via xblock webencodings==0.5.1 # via bleach webob==1.8.7 # via xblock -xblock==1.10.0 +xblock==3.1.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index 0bf79695..d8e8ac49 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -12,33 +12,43 @@ arrow==1.3.0 # via # -r requirements/test.txt # cookiecutter -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # -r requirements/test.txt # pylint # pylint-celery attrs==23.2.0 # via -r requirements/test.txt +backports-tarfile==1.0.0 + # via + # -r requirements/test.txt + # jaraco-context +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # django + # djangorestframework binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter bleach==6.1.0 # via -r requirements/test.txt -boto3==1.34.45 +boto3==1.34.83 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.45 +botocore==1.34.83 # via # -r requirements/test.txt # boto3 # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via # -r requirements/tox.txt # tox @@ -73,7 +83,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.8.0 # via # -r requirements/test.txt # edx-lint @@ -81,7 +91,7 @@ colorama==0.4.6 # via # -r requirements/tox.txt # tox -cookiecutter==2.5.0 +cookiecutter==2.6.0 # via # -r requirements/test.txt # xblock-sdk @@ -91,11 +101,11 @@ coverage==6.5.0 # coveralls coveralls==3.3.1 # via -r requirements/test.txt -cryptography==42.0.3 +cryptography==42.0.5 # via # -r requirements/test.txt # secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 # via @@ -105,7 +115,7 @@ distlib==0.3.8 # via # -r requirements/tox.txt # virtualenv -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -125,13 +135,13 @@ django-appconf==1.0.6 # via # -r requirements/test.txt # django-statici18n -django-config-models==2.5.1 +django-config-models==2.7.0 # via -r requirements/test.txt django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/test.txt django-statici18n==2.4.0 # via -r requirements/test.txt @@ -139,7 +149,7 @@ django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/test.txt # django-config-models @@ -153,7 +163,7 @@ docutils==0.20.1 # readme-renderer edx-ccx-keys==1.2.1 # via -r requirements/test.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via # -r requirements/test.txt # django-config-models @@ -163,7 +173,7 @@ edx-opaque-keys[django]==2.5.1 # via # -r requirements/test.txt # edx-ccx-keys -filelock==3.13.1 +filelock==3.13.4 # via # -r requirements/tox.txt # tox @@ -179,20 +189,21 @@ fs-s3fs==1.1.1 # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -future==0.18.3 +future==1.0.0 # via # -r requirements/test.txt # pyjwkest -idna==3.6 +idna==3.7 # via # -r requirements/test.txt # requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/test.txt # keyring # twine -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via # -r requirements/test.txt # keyring @@ -200,7 +211,15 @@ isort==5.13.2 # via # -r requirements/test.txt # pylint -jaraco-classes==3.3.1 +jaraco-classes==3.4.0 + # via + # -r requirements/test.txt + # keyring +jaraco-context==5.3.0 + # via + # -r requirements/test.txt + # keyring +jaraco-functools==4.0.0 # via # -r requirements/test.txt # keyring @@ -221,18 +240,19 @@ jmespath==1.0.1 # botocore jsonfield==3.1.0 # via -r requirements/test.txt -keyring==24.3.0 +keyring==25.1.0 # via # -r requirements/test.txt # twine lazy==1.6 # via -r requirements/test.txt -lxml==5.1.0 +lxml==4.9.4 # via + # -c requirements/constraints.txt # -r requirements/test.txt # xblock # xblock-sdk -mako==1.3.2 +mako==1.3.3 # via # -r requirements/test.txt # xblock @@ -260,21 +280,22 @@ more-itertools==10.2.0 # via # -r requirements/test.txt # jaraco-classes -newrelic==9.6.0 + # jaraco-functools +newrelic==9.8.0 # via # -r requirements/test.txt # edx-django-utils -nh3==0.2.15 +nh3==0.2.17 # via # -r requirements/test.txt # readme-renderer oauthlib==3.2.2 # via -r requirements/test.txt -openedx-django-pyfs==3.5.0 +openedx-django-pyfs==3.6.0 # via -r requirements/test.txt openedx-filters==1.6.0 # via -r requirements/test.txt -packaging==23.2 +packaging==24.0 # via # -r requirements/tox.txt # pyproject-api @@ -283,7 +304,7 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via # -r requirements/test.txt # twine @@ -304,7 +325,7 @@ psutil==5.9.8 # edx-django-utils pycodestyle==2.11.1 # via -r requirements/test.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi @@ -319,7 +340,7 @@ pygments==2.17.2 # rich pyjwkest==1.4.2 # via -r requirements/test.txt -pylint==3.0.3 +pylint==3.1.0 # via # -r requirements/test.txt # edx-lint @@ -355,7 +376,7 @@ pyproject-api==1.6.1 # via # -r requirements/tox.txt # tox -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # arrow @@ -369,8 +390,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt - # django - # djangorestframework # xblock pyyaml==6.0.1 # via @@ -378,7 +397,7 @@ pyyaml==6.0.1 # code-annotations # cookiecutter # xblock -readme-renderer==42.0 +readme-renderer==43.0 # via # -r requirements/test.txt # twine @@ -399,12 +418,12 @@ rfc3986==2.0.0 # via # -r requirements/test.txt # twine -rich==13.7.0 +rich==13.7.1 # via # -r requirements/test.txt # cookiecutter # twine -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/test.txt # boto3 @@ -431,7 +450,7 @@ sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations @@ -448,19 +467,19 @@ tomli==2.0.1 # pylint # pyproject-api # tox -tomlkit==0.12.3 +tomlkit==0.12.4 # via # -r requirements/test.txt # pylint -tox==4.13.0 +tox==4.14.2 # via -r requirements/tox.txt twine==5.0.0 # via -r requirements/test.txt -types-python-dateutil==2.8.19.20240106 +types-python-dateutil==2.9.0.20240316 # via # -r requirements/test.txt # arrow -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/test.txt # asgiref @@ -475,11 +494,11 @@ urllib3==1.26.18 # botocore # requests # twine -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/tox.txt # tox -web-fragments==2.1.0 +web-fragments==2.2.0 # via # -r requirements/test.txt # xblock @@ -493,13 +512,13 @@ webob==1.8.7 # -r requirements/test.txt # xblock # xblock-sdk -xblock==1.10.0 +xblock==3.1.0 # via # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.7.0 +xblock-sdk==0.10.0 # via -r requirements/test.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/test.txt # importlib-metadata diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 15aafb29..e3bf8eae 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,7 +13,7 @@ # using LTS django version -Django<4.0 +Django<5.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 @@ -21,3 +21,12 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 + +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 135dca90..06e52b0c 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,3 +12,7 @@ -c common_constraints.txt urllib3<1.27,>=1.25.4 +lxml<5.0.0 + +backports-zoneinfo==0.2.1 ; python_version < "3.9" + diff --git a/requirements/dev.txt b/requirements/dev.txt index 837c1268..c76e9d11 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,19 +8,24 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django attrs==23.2.0 # via -r requirements/base.txt +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/base.txt + # django + # djangorestframework bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.45 +boto3==1.34.83 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.45 +botocore==1.34.83 # via # -r requirements/base.txt # boto3 @@ -41,7 +46,7 @@ click==8.1.7 # via # -r requirements/base.txt # edx-django-utils -django==3.2.24 +django==4.2.11 # via # -r requirements/base.txt # django-appconf @@ -60,13 +65,13 @@ django-appconf==1.0.6 # via # -r requirements/base.txt # django-statici18n -django-config-models==2.5.1 +django-config-models==2.7.0 # via -r requirements/base.txt django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/base.txt django-statici18n==2.4.0 # via -r requirements/base.txt @@ -74,17 +79,17 @@ django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # django-config-models edx-ccx-keys==1.2.1 # via -r requirements/base.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via # -r requirements/base.txt # django-config-models -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.5.0 # via -r requirements/dev.in edx-opaque-keys[django]==2.5.1 # via @@ -100,11 +105,11 @@ fs-s3fs==1.1.1 # via # -r requirements/base.txt # openedx-django-pyfs -future==0.18.3 +future==1.0.0 # via # -r requirements/base.txt # pyjwkest -idna==3.6 +idna==3.7 # via # -r requirements/base.txt # requests @@ -117,12 +122,12 @@ jsonfield==3.1.0 # via -r requirements/base.txt lazy==1.6 # via -r requirements/base.txt -lxml==5.1.0 +lxml==4.9.4 # via # -r requirements/base.txt # edx-i18n-tools # xblock -mako==1.3.2 +mako==1.3.3 # via # -r requirements/base.txt # xblock @@ -131,17 +136,17 @@ markupsafe==2.1.5 # -r requirements/base.txt # mako # xblock -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils oauthlib==3.2.2 # via -r requirements/base.txt -openedx-django-pyfs==3.5.0 +openedx-django-pyfs==3.6.0 # via -r requirements/base.txt openedx-filters==1.6.0 # via -r requirements/base.txt -path==16.10.0 +path==16.14.0 # via edx-i18n-tools pbr==6.0.0 # via @@ -153,7 +158,7 @@ psutil==5.9.8 # via # -r requirements/base.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -171,7 +176,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # botocore @@ -179,8 +184,6 @@ python-dateutil==2.8.2 pytz==2024.1 # via # -r requirements/base.txt - # django - # djangorestframework # xblock pyyaml==6.0.1 # via @@ -191,7 +194,7 @@ requests==2.31.0 # via # -r requirements/base.txt # pyjwkest -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/base.txt # boto3 @@ -212,12 +215,12 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # edx-django-utils # edx-opaque-keys -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/base.txt # asgiref @@ -227,7 +230,7 @@ urllib3==1.26.18 # -r requirements/base.txt # botocore # requests -web-fragments==2.1.0 +web-fragments==2.2.0 # via # -r requirements/base.txt # xblock @@ -239,7 +242,7 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -xblock==1.10.0 +xblock==3.1.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/django.txt b/requirements/django.txt index 7eec28f9..1facfe28 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.24 +django==4.2.10 diff --git a/requirements/pip.txt b/requirements/pip.txt index 71954cc6..cf449024 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # 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.0 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index fb84d102..4e1105e9 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,15 +4,17 @@ # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build +packaging==24.0 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in pyproject-hooks==1.0.0 # via @@ -23,9 +25,9 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index 3b45a423..112a0429 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -10,25 +10,31 @@ appdirs==1.4.4 # fs arrow==1.3.0 # via cookiecutter -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # pylint # pylint-celery attrs==23.2.0 # via -r requirements/base.txt +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/base.txt + # django + # djangorestframework binaryornot==0.4.4 # via cookiecutter bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.45 +boto3==1.34.83 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.45 +botocore==1.34.83 # via # -r requirements/base.txt # boto3 @@ -57,15 +63,15 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.8.0 # via edx-lint -cookiecutter==2.5.0 +cookiecutter==2.6.0 # via xblock-sdk -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/quality.in dill==0.3.8 # via pylint -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -85,13 +91,13 @@ django-appconf==1.0.6 # via # -r requirements/base.txt # django-statici18n -django-config-models==2.5.1 +django-config-models==2.7.0 # via -r requirements/base.txt django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/base.txt django-statici18n==2.4.0 # via -r requirements/base.txt @@ -99,13 +105,13 @@ django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # django-config-models edx-ccx-keys==1.2.1 # via -r requirements/base.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via # -r requirements/base.txt # django-config-models @@ -126,11 +132,11 @@ fs-s3fs==1.1.1 # -r requirements/base.txt # openedx-django-pyfs # xblock-sdk -future==0.18.3 +future==1.0.0 # via # -r requirements/base.txt # pyjwkest -idna==3.6 +idna==3.7 # via # -r requirements/base.txt # requests @@ -149,12 +155,13 @@ jsonfield==3.1.0 # via -r requirements/base.txt lazy==1.6 # via -r requirements/base.txt -lxml==5.1.0 +lxml==4.9.4 # via + # -c requirements/constraints.txt # -r requirements/base.txt # xblock # xblock-sdk -mako==1.3.2 +mako==1.3.3 # via # -r requirements/base.txt # xblock @@ -170,13 +177,13 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils oauthlib==3.2.2 # via -r requirements/base.txt -openedx-django-pyfs==3.5.0 +openedx-django-pyfs==3.6.0 # via -r requirements/base.txt openedx-filters==1.6.0 # via -r requirements/base.txt @@ -192,7 +199,7 @@ psutil==5.9.8 # edx-django-utils pycodestyle==2.11.1 # via -r requirements/quality.in -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -204,7 +211,7 @@ pygments==2.17.2 # via rich pyjwkest==1.4.2 # via -r requirements/base.txt -pylint==3.0.3 +pylint==3.1.0 # via # -r requirements/quality.in # edx-lint @@ -229,7 +236,7 @@ pynacl==1.5.0 # edx-django-utils pypng==0.20220715.0 # via xblock-sdk -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # arrow @@ -242,8 +249,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django - # djangorestframework # xblock pyyaml==6.0.1 # via @@ -257,9 +262,9 @@ requests==2.31.0 # cookiecutter # pyjwkest # xblock-sdk -rich==13.7.0 +rich==13.7.1 # via cookiecutter -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/base.txt # boto3 @@ -282,7 +287,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -292,11 +297,11 @@ text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via pylint -tomlkit==0.12.3 +tomlkit==0.12.4 # via pylint -types-python-dateutil==2.8.19.20240106 +types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/base.txt # asgiref @@ -310,7 +315,7 @@ urllib3==1.26.18 # -r requirements/base.txt # botocore # requests -web-fragments==2.1.0 +web-fragments==2.2.0 # via # -r requirements/base.txt # xblock @@ -324,11 +329,11 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock==1.10.0 +xblock==3.1.0 # via # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.7.0 +xblock-sdk==0.10.0 # via -r requirements/quality.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index eae75e05..26585cc6 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,25 +10,33 @@ appdirs==1.4.4 # fs arrow==1.3.0 # via cookiecutter -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # pylint # pylint-celery attrs==23.2.0 # via -r requirements/base.txt +backports-tarfile==1.0.0 + # via jaraco-context +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/base.txt + # django + # djangorestframework binaryornot==0.4.4 # via cookiecutter bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.45 +boto3==1.34.83 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.45 +botocore==1.34.83 # via # -r requirements/base.txt # boto3 @@ -58,20 +66,21 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.8.0 # via edx-lint -cookiecutter==2.5.0 +cookiecutter==2.6.0 # via xblock-sdk coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/test.in -cryptography==42.0.3 +cryptography==42.0.5 # via secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.in dill==0.3.8 # via pylint +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -91,13 +100,13 @@ django-appconf==1.0.6 # via # -r requirements/base.txt # django-statici18n -django-config-models==2.5.1 +django-config-models==2.7.0 # via -r requirements/base.txt django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/base.txt django-statici18n==2.4.0 # via -r requirements/base.txt @@ -105,7 +114,7 @@ django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # -r requirements/test.in @@ -116,7 +125,7 @@ docutils==0.20.1 # via readme-renderer edx-ccx-keys==1.2.1 # via -r requirements/base.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via # -r requirements/base.txt # django-config-models @@ -137,23 +146,28 @@ fs-s3fs==1.1.1 # -r requirements/base.txt # openedx-django-pyfs # xblock-sdk -future==0.18.3 +future==1.0.0 # via # -r requirements/base.txt # pyjwkest -idna==3.6 +idna==3.7 # via # -r requirements/base.txt # requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # keyring # twine -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via keyring isort==5.13.2 # via pylint -jaraco-classes==3.3.1 +jaraco-classes==3.4.0 + # via keyring +jaraco-context==5.3.0 + # via keyring +jaraco-functools==4.0.0 # via keyring jeepney==0.8.0 # via @@ -170,16 +184,17 @@ jmespath==1.0.1 # botocore jsonfield==3.1.0 # via -r requirements/base.txt -keyring==24.3.0 +keyring==25.1.0 # via twine lazy==1.6 # via -r requirements/base.txt -lxml==5.1.0 +lxml==4.9.4 # via + # -c requirements/constraints.txt # -r requirements/base.txt # xblock # xblock-sdk -mako==1.3.2 +mako==1.3.3 # via # -r requirements/base.txt # xblock @@ -198,16 +213,18 @@ mdurl==0.1.2 mock==5.1.0 # via -r requirements/test.in more-itertools==10.2.0 - # via jaraco-classes -newrelic==9.6.0 + # via + # jaraco-classes + # jaraco-functools +newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils -nh3==0.2.15 +nh3==0.2.17 # via readme-renderer oauthlib==3.2.2 # via -r requirements/base.txt -openedx-django-pyfs==3.5.0 +openedx-django-pyfs==3.6.0 # via -r requirements/base.txt openedx-filters==1.6.0 # via -r requirements/base.txt @@ -215,7 +232,7 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine platformdirs==4.2.0 # via pylint @@ -225,7 +242,7 @@ psutil==5.9.8 # edx-django-utils pycodestyle==2.11.1 # via -r requirements/test.in -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -239,7 +256,7 @@ pygments==2.17.2 # rich pyjwkest==1.4.2 # via -r requirements/base.txt -pylint==3.0.3 +pylint==3.1.0 # via # edx-lint # pylint-celery @@ -263,7 +280,7 @@ pynacl==1.5.0 # edx-django-utils pypng==0.20220715.0 # via xblock-sdk -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # arrow @@ -276,8 +293,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django - # djangorestframework # xblock pyyaml==6.0.1 # via @@ -285,7 +300,7 @@ pyyaml==6.0.1 # code-annotations # cookiecutter # xblock -readme-renderer==42.0 +readme-renderer==43.0 # via # -r requirements/test.in # twine @@ -302,11 +317,11 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.7.1 # via # cookiecutter # twine -s3transfer==0.10.0 +s3transfer==0.10.1 # via # -r requirements/base.txt # boto3 @@ -331,7 +346,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -341,13 +356,13 @@ text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via pylint -tomlkit==0.12.3 +tomlkit==0.12.4 # via pylint twine==5.0.0 # via -r requirements/test.in -types-python-dateutil==2.8.19.20240106 +types-python-dateutil==2.9.0.20240316 # via arrow -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/base.txt # asgiref @@ -362,7 +377,7 @@ urllib3==1.26.18 # botocore # requests # twine -web-fragments==2.1.0 +web-fragments==2.2.0 # via # -r requirements/base.txt # xblock @@ -376,13 +391,13 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock==1.10.0 +xblock==3.1.0 # via # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.7.0 +xblock-sdk==0.10.0 # via -r requirements/test.in -zipp==3.17.0 +zipp==3.18.1 # via # importlib-metadata # importlib-resources diff --git a/requirements/tox.txt b/requirements/tox.txt index 51576e80..246985fb 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.3.2 +cachetools==5.3.3 # via tox chardet==5.2.0 # via tox @@ -12,11 +12,11 @@ colorama==0.4.6 # via tox distlib==0.3.8 # via virtualenv -filelock==3.13.1 +filelock==3.13.4 # via # tox # virtualenv -packaging==23.2 +packaging==24.0 # via # pyproject-api # tox @@ -32,7 +32,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.13.0 +tox==4.14.2 # via -r requirements/tox.in -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox diff --git a/tox.ini b/tox.ini index 4ad0528a..f0674cca 100644 --- a/tox.ini +++ b/tox.ini @@ -1,21 +1,20 @@ [tox] -envlist = py38-django{32,42}, quality +envlist = py{38, 311}-django{42}, quality [testenv] -allowlist_externals = +allowlist_externals = make -deps = - django32: Django>=3.2,<4.0 +deps = django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt -commands = +commands = make test [testenv:quality] -allowlist_externals = +allowlist_externals = make -deps = +deps = -r{toxinidir}/requirements/quality.txt -commands = +commands = make quality From 2efe2bb35332f66813351ed99ec6ed8d06b23dbc Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Thu, 25 Apr 2024 03:03:00 -0400 Subject: [PATCH 05/10] Python Requirements Update (#471) * chore: Updating Python Requirements * fix: remove lxml pin --------- Co-authored-by: Irtaza Akram --- CHANGELOG.rst | 5 ++++ lti_consumer/__init__.py | 2 +- requirements/base.txt | 21 ++++++++-------- requirements/ci.txt | 47 ++++++++++++------------------------ requirements/constraints.txt | 2 -- requirements/dev.txt | 20 +++++++-------- requirements/pip.txt | 2 +- requirements/quality.txt | 25 +++++++++---------- requirements/test.txt | 38 +++++++++++------------------ requirements/tox.txt | 6 ++--- 10 files changed, 72 insertions(+), 96 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0789674c..4fd4bad0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,6 +16,11 @@ Please See the `releases tab =1.25.4 -lxml<5.0.0 backports-zoneinfo==0.2.1 ; python_version < "3.9" - diff --git a/requirements/dev.txt b/requirements/dev.txt index c76e9d11..5e73a357 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -21,11 +21,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # djangorestframework bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.83 +boto3==1.34.90 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.83 +botocore==1.34.90 # via # -r requirements/base.txt # boto3 @@ -73,7 +73,7 @@ django-crum==0.7.9 # edx-django-utils django-filter==24.2 # via -r requirements/base.txt -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via -r requirements/base.txt django-waffle==4.1.0 # via @@ -83,7 +83,7 @@ djangorestframework==3.15.1 # via # -r requirements/base.txt # django-config-models -edx-ccx-keys==1.2.1 +edx-ccx-keys==1.3.0 # via -r requirements/base.txt edx-django-utils==5.12.0 # via @@ -91,7 +91,7 @@ edx-django-utils==5.12.0 # django-config-models edx-i18n-tools==1.5.0 # via -r requirements/dev.in -edx-opaque-keys[django]==2.5.1 +edx-opaque-keys[django]==2.8.0 # via # -r requirements/base.txt # edx-ccx-keys @@ -122,7 +122,7 @@ jsonfield==3.1.0 # via -r requirements/base.txt lazy==1.6 # via -r requirements/base.txt -lxml==4.9.4 +lxml==5.2.1 # via # -r requirements/base.txt # edx-i18n-tools @@ -136,7 +136,7 @@ markupsafe==2.1.5 # -r requirements/base.txt # mako # xblock -newrelic==9.8.0 +newrelic==9.9.0 # via # -r requirements/base.txt # edx-django-utils @@ -144,7 +144,7 @@ oauthlib==3.2.2 # via -r requirements/base.txt openedx-django-pyfs==3.6.0 # via -r requirements/base.txt -openedx-filters==1.6.0 +openedx-filters==1.8.1 # via -r requirements/base.txt path==16.14.0 # via edx-i18n-tools @@ -211,7 +211,7 @@ six==1.16.0 # fs-s3fs # pyjwkest # python-dateutil -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/base.txt # django @@ -242,7 +242,7 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -xblock==3.1.0 +xblock==4.0.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index cf449024..e3ffcc7b 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.43.0 # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.2.0 +setuptools==69.5.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 112a0429..0967d8d4 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -30,11 +30,11 @@ binaryornot==0.4.4 # via cookiecutter bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.83 +boto3==1.34.90 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.83 +botocore==1.34.90 # via # -r requirements/base.txt # boto3 @@ -99,7 +99,7 @@ django-crum==0.7.9 # edx-django-utils django-filter==24.2 # via -r requirements/base.txt -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via -r requirements/base.txt django-waffle==4.1.0 # via @@ -109,7 +109,7 @@ djangorestframework==3.15.1 # via # -r requirements/base.txt # django-config-models -edx-ccx-keys==1.2.1 +edx-ccx-keys==1.3.0 # via -r requirements/base.txt edx-django-utils==5.12.0 # via @@ -117,7 +117,7 @@ edx-django-utils==5.12.0 # django-config-models edx-lint==5.3.6 # via -r requirements/quality.in -edx-opaque-keys[django]==2.5.1 +edx-opaque-keys[django]==2.8.0 # via # -r requirements/base.txt # edx-ccx-keys @@ -155,9 +155,8 @@ jsonfield==3.1.0 # via -r requirements/base.txt lazy==1.6 # via -r requirements/base.txt -lxml==4.9.4 +lxml==5.2.1 # via - # -c requirements/constraints.txt # -r requirements/base.txt # xblock # xblock-sdk @@ -177,7 +176,7 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -newrelic==9.8.0 +newrelic==9.9.0 # via # -r requirements/base.txt # edx-django-utils @@ -185,13 +184,13 @@ oauthlib==3.2.2 # via -r requirements/base.txt openedx-django-pyfs==3.6.0 # via -r requirements/base.txt -openedx-filters==1.6.0 +openedx-filters==1.8.1 # via -r requirements/base.txt pbr==6.0.0 # via # -r requirements/base.txt # stevedore -platformdirs==4.2.0 +platformdirs==4.2.1 # via pylint psutil==5.9.8 # via @@ -283,7 +282,7 @@ six==1.16.0 # fs-s3fs # pyjwkest # python-dateutil -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/base.txt # django @@ -329,11 +328,11 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock==3.1.0 +xblock==4.0.0 # via # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.10.0 +xblock-sdk==0.11.0 # via -r requirements/quality.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 26585cc6..cf8fb89a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -20,7 +20,7 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via -r requirements/base.txt -backports-tarfile==1.0.0 +backports-tarfile==1.1.1 # via jaraco-context backports-zoneinfo==0.2.1 ; python_version < "3.9" # via @@ -32,11 +32,11 @@ binaryornot==0.4.4 # via cookiecutter bleach==6.1.0 # via -r requirements/base.txt -boto3==1.34.83 +boto3==1.34.90 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.83 +botocore==1.34.90 # via # -r requirements/base.txt # boto3 @@ -48,7 +48,6 @@ certifi==2024.2.2 cffi==1.16.0 # via # -r requirements/base.txt - # cryptography # pynacl chardet==5.2.0 # via binaryornot @@ -74,8 +73,6 @@ coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/test.in -cryptography==42.0.5 - # via secretstorage ddt==1.7.2 # via -r requirements/test.in dill==0.3.8 @@ -108,7 +105,7 @@ django-crum==0.7.9 # edx-django-utils django-filter==24.2 # via -r requirements/base.txt -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via -r requirements/base.txt django-waffle==4.1.0 # via @@ -123,7 +120,7 @@ docopt==0.6.2 # via coveralls docutils==0.20.1 # via readme-renderer -edx-ccx-keys==1.2.1 +edx-ccx-keys==1.3.0 # via -r requirements/base.txt edx-django-utils==5.12.0 # via @@ -131,7 +128,7 @@ edx-django-utils==5.12.0 # django-config-models edx-lint==5.3.6 # via -r requirements/test.in -edx-opaque-keys[django]==2.5.1 +edx-opaque-keys[django]==2.8.0 # via # -r requirements/base.txt # edx-ccx-keys @@ -167,12 +164,8 @@ jaraco-classes==3.4.0 # via keyring jaraco-context==5.3.0 # via keyring -jaraco-functools==4.0.0 +jaraco-functools==4.0.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.3 # via # code-annotations @@ -188,9 +181,8 @@ keyring==25.1.0 # via twine lazy==1.6 # via -r requirements/base.txt -lxml==4.9.4 +lxml==5.2.1 # via - # -c requirements/constraints.txt # -r requirements/base.txt # xblock # xblock-sdk @@ -216,7 +208,7 @@ more-itertools==10.2.0 # via # jaraco-classes # jaraco-functools -newrelic==9.8.0 +newrelic==9.9.0 # via # -r requirements/base.txt # edx-django-utils @@ -226,7 +218,7 @@ oauthlib==3.2.2 # via -r requirements/base.txt openedx-django-pyfs==3.6.0 # via -r requirements/base.txt -openedx-filters==1.6.0 +openedx-filters==1.8.1 # via -r requirements/base.txt pbr==6.0.0 # via @@ -234,7 +226,7 @@ pbr==6.0.0 # stevedore pkginfo==1.10.0 # via twine -platformdirs==4.2.0 +platformdirs==4.2.1 # via pylint psutil==5.9.8 # via @@ -325,8 +317,6 @@ s3transfer==0.10.1 # via # -r requirements/base.txt # boto3 -secretstorage==3.3.3 - # via keyring simplejson==3.19.2 # via # -r requirements/base.txt @@ -342,7 +332,7 @@ six==1.16.0 # fs-s3fs # pyjwkest # python-dateutil -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/base.txt # django @@ -391,11 +381,11 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock==3.1.0 +xblock==4.0.0 # via # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.10.0 +xblock-sdk==0.11.0 # via -r requirements/test.in zipp==3.18.1 # via diff --git a/requirements/tox.txt b/requirements/tox.txt index 246985fb..b213aa76 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -20,11 +20,11 @@ packaging==24.0 # via # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.2.1 # via # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox pyproject-api==1.6.1 # via tox @@ -34,5 +34,5 @@ tomli==2.0.1 # tox tox==4.14.2 # via -r requirements/tox.in -virtualenv==20.25.1 +virtualenv==20.26.0 # via tox From 83384f0c215f3b944db6625394231189ff5b4eba Mon Sep 17 00:00:00 2001 From: Alison Langston <46360176+alangsto@users.noreply.github.com> Date: Thu, 30 May 2024 15:36:37 -0400 Subject: [PATCH 06/10] fix: add utf-8 encoding for user fields (#477) --- CHANGELOG.rst | 5 ++++- lti_consumer/__init__.py | 2 +- lti_consumer/lti_xblock.py | 2 +- lti_consumer/tests/unit/test_lti_xblock.py | 9 +++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4fd4bad0..059e956c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,11 +16,14 @@ Please See the `releases tab Date: Thu, 30 May 2024 16:08:19 -0400 Subject: [PATCH 07/10] feat: update python version for pypi (#478) --- .github/workflows/pypi-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 53883d95..beece0c7 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -16,7 +16,7 @@ jobs: - name: setup python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.11 - name: Install pip run: pip install -r requirements/pip.txt From f8f36b338f0d122c6d4c9235cfb6ea0aaba0d727 Mon Sep 17 00:00:00 2001 From: Alison Langston <46360176+alangsto@users.noreply.github.com> Date: Thu, 30 May 2024 16:32:30 -0400 Subject: [PATCH 08/10] fix: create new release version (#479) --- CHANGELOG.rst | 6 +++++- lti_consumer/__init__.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 059e956c..3a3b8dfc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,7 +16,11 @@ Please See the `releases tab Date: Fri, 7 Jun 2024 09:17:14 -0400 Subject: [PATCH 09/10] fix: remove utf-8 encoding for full name (#481) --- CHANGELOG.rst | 4 ++++ lti_consumer/__init__.py | 2 +- lti_consumer/lti_xblock.py | 2 +- lti_consumer/tests/unit/test_lti_xblock.py | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3a3b8dfc..77512030 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,6 +16,10 @@ Please See the `releases tab Date: Mon, 8 Apr 2024 15:26:58 +0300 Subject: [PATCH 10/10] fix: Data too long for column 'resource_id' when the course id is a little bit long, the lti xblock id becomes too long for resource_id to handle --- CHANGELOG.rst | 7 ++++++- lti_consumer/__init__.py | 2 +- .../0018_increase_length_of_resource_id.py | 18 ++++++++++++++++++ lti_consumer/models.py | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 lti_consumer/migrations/0018_increase_length_of_resource_id.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 77512030..0a47cc5d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,6 +16,11 @@ Please See the `releases tab