From 6db6fe6c9da29b6e89d672d719079df27dcb5f42 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sat, 13 Apr 2024 20:13:30 -0400 Subject: [PATCH 1/7] chore: Updating Python Requirements --- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 10 +++++----- requirements/django.txt | 8 ++++---- requirements/doc.txt | 10 +++++----- requirements/pip.txt | 2 +- requirements/test.txt | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 754eef42d..8a4b98054 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,7 +14,7 @@ lxml==4.9.4 # via # -c requirements/constraints.txt # -r requirements/base.in -mako==1.3.2 +mako==1.3.3 # via -r requirements/base.in markupsafe==2.1.5 # via diff --git a/requirements/ci.txt b/requirements/ci.txt index 2e918e8de..87efe7989 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -14,7 +14,7 @@ coverage==7.4.4 # via -r requirements/ci.in distlib==0.3.8 # via virtualenv -filelock==3.13.3 +filelock==3.13.4 # via # tox # virtualenv diff --git a/requirements/dev.txt b/requirements/dev.txt index 563f1b446..8a708647d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django -boto3==1.34.80 +boto3==1.34.84 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.80 +botocore==1.34.84 # via # -r requirements/test.txt # boto3 @@ -103,7 +103,7 @@ exceptiongroup==1.2.0 # -r requirements/test.txt # hypothesis # pytest -filelock==3.13.3 +filelock==3.13.4 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -160,7 +160,7 @@ lxml==4.9.4 # via # -c requirements/constraints.txt # -r requirements/test.txt -mako==1.3.2 +mako==1.3.3 # via -r requirements/test.txt markupsafe==2.1.5 # via @@ -290,7 +290,7 @@ sortedcontainers==2.4.0 # via # -r requirements/test.txt # hypothesis -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/test.txt # django diff --git a/requirements/django.txt b/requirements/django.txt index 759ea21aa..4175717c8 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.in # django -boto3==1.34.80 +boto3==1.34.84 # via fs-s3fs -botocore==1.34.80 +botocore==1.34.84 # via # boto3 # s3transfer @@ -44,7 +44,7 @@ lxml==4.9.4 # via # -c requirements/constraints.txt # -r requirements/base.txt -mako==1.3.2 +mako==1.3.3 # via -r requirements/base.txt markupsafe==2.1.5 # via @@ -78,7 +78,7 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil -sqlparse==0.4.4 +sqlparse==0.5.0 # via django stevedore==5.2.0 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index 707dc7cd6..78fad9e82 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -26,11 +26,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # django beautifulsoup4==4.12.3 # via pydata-sphinx-theme -boto3==1.34.80 +boto3==1.34.84 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.80 +botocore==1.34.84 # via # -r requirements/django.txt # boto3 @@ -59,7 +59,7 @@ fs-s3fs==1.1.1 # via # -r requirements/django.txt # openedx-django-pyfs -idna==3.6 +idna==3.7 # via requests imagesize==1.4.1 # via sphinx @@ -80,7 +80,7 @@ lxml==4.9.4 # via # -c requirements/constraints.txt # -r requirements/django.txt -mako==1.3.2 +mako==1.3.3 # via -r requirements/django.txt markupsafe==2.1.5 # via @@ -157,7 +157,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/django.txt # django diff --git a/requirements/pip.txt b/requirements/pip.txt index cf449024a..e3ffcc7b6 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/test.txt b/requirements/test.txt index 94d235b6b..7af0264bc 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,11 +23,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.txt # django -boto3==1.34.80 +boto3==1.34.84 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.80 +botocore==1.34.84 # via # -r requirements/django.txt # boto3 @@ -73,7 +73,7 @@ exceptiongroup==1.2.0 # via # hypothesis # pytest -filelock==3.13.3 +filelock==3.13.4 # via # tox # virtualenv @@ -116,7 +116,7 @@ lxml==4.9.4 # via # -c requirements/constraints.txt # -r requirements/django.txt -mako==1.3.2 +mako==1.3.3 # via -r requirements/django.txt markupsafe==2.1.5 # via @@ -213,7 +213,7 @@ six==1.16.0 # python-dateutil sortedcontainers==2.4.0 # via hypothesis -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/django.txt # django From 2ae45573c96e3d863b03e22828d362431ee5fa58 Mon Sep 17 00:00:00 2001 From: connorhaugh <49422820+connorhaugh@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:33:48 -0400 Subject: [PATCH 2/7] feat: readd fragment as passthrough to webfragement.fragment (#739) a previous deprecation of this pass-through causes wide-spread consequences. --- CHANGELOG.rst | 9 +++++++-- xblock/__init__.py | 2 +- xblock/fragment.py | 25 +++++++++++++++++++++++++ xblock/test/test_fragment.py | 21 +++++++++++++++++++++ 4 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 xblock/fragment.py create mode 100644 xblock/test/test_fragment.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c91ccab58..f5c4e4a5c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,11 @@ Change history for XBlock Unreleased ---------- +4.0.0 - 2024-04-18 +------------------ + +* xblock.fragment has returned as a pass-though component to web_fragments.fragment + 3.0.0 - 2024-03-18 ------------------ @@ -15,7 +20,7 @@ will be unaffected by this change. Some improvements have also been made to the Specific changes: -* **Removed:** +* **Removed:** * ``xblock.XBlockMixin`` (still available as ``xblock.core.XBlockMixin``) * ``xblock.core.SharedBlockBase`` (replaced with ``xblock.core.Blocklike``) @@ -53,7 +58,7 @@ Specific changes: * Various docstrings have been improved, some of which are published in the docs. * XBlockAside will now be represented in the API docs, right below XBlock on the "XBlock API" page. - * XBlockMixin has been removed from the docs. + * XBlockMixin has been removed from the docs. It was only ever documented under the "Fields API" page (which didn't make any sense), and it was barely even documented there. We considered adding it back to the "XBlock API" page, but as noted in the class's new docstring, we do not want to encourage any new use of XBlockMixin. diff --git a/xblock/__init__.py b/xblock/__init__.py index 9737a15cc..ff55f6857 100644 --- a/xblock/__init__.py +++ b/xblock/__init__.py @@ -2,4 +2,4 @@ XBlock Courseware Components """ -__version__ = '3.1.0' +__version__ = '4.0.0' diff --git a/xblock/fragment.py b/xblock/fragment.py new file mode 100644 index 000000000..0a117c4b1 --- /dev/null +++ b/xblock/fragment.py @@ -0,0 +1,25 @@ +""" +Makes the Fragment class available through the old namespace location. +""" +import warnings + +import web_fragments.fragment + + +class Fragment(web_fragments.fragment.Fragment): + """ + A wrapper around web_fragments.fragment.Fragment that provides + backwards compatibility for the old location. + Deprecated. + """ + def __init__(self, *args, **kwargs): + warnings.warn( + 'xblock.fragment is deprecated. Please use web_fragments.fragment instead', + DeprecationWarning, + stacklevel=2 + ) + super().__init__(*args, **kwargs) + + # Provide older names for renamed methods + add_frag_resources = web_fragments.fragment.Fragment.add_fragment_resources + add_frags_resources = web_fragments.fragment.Fragment.add_resources diff --git a/xblock/test/test_fragment.py b/xblock/test/test_fragment.py new file mode 100644 index 000000000..193694334 --- /dev/null +++ b/xblock/test/test_fragment.py @@ -0,0 +1,21 @@ +""" +Unit tests for the Fragment class. +Note: this class has been deprecated in favor of web_fragments.fragment.Fragment +""" +from unittest import TestCase + +from xblock.fragment import Fragment + + +class TestFragment(TestCase): + """ + Unit tests for fragments. + """ + def test_fragment(self): + """ + Test the delegated Fragment class. + """ + TEST_HTML = '

Hello, world!

' # pylint: disable=invalid-name + fragment = Fragment() + fragment.add_content(TEST_HTML) + self.assertEqual(fragment.body_html(), TEST_HTML) From 5cd0f6686baac9c76544502f4aea0f2468e48bd6 Mon Sep 17 00:00:00 2001 From: farhan Date: Mon, 22 Apr 2024 16:21:29 +0500 Subject: [PATCH 3/7] chore: remove lxml constraint --- requirements/constraints.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 4cba57814..3bb18ffde 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -14,4 +14,3 @@ # diff-cover latest requires (pluggy>=0.13.1,<0.14.0) which conflicts with pytest which requires(pluggy>=0.12,<2.0.0) # Using the same version of diff-cover which is being used currently in edx-platform to avoid this conflict. diff-cover==4.0.0 -lxml<5.0.0 From f0325bac6525fa6467ea08ef9ad98be8af2230ed Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:39:16 -0400 Subject: [PATCH 4/7] chore: Updating Python Requirements (#744) --- requirements/base.txt | 6 ++---- requirements/ci.txt | 4 ++-- requirements/dev.txt | 16 +++++++--------- requirements/django.txt | 10 ++++------ requirements/doc.txt | 10 ++++------ requirements/test.txt | 16 +++++++--------- 6 files changed, 26 insertions(+), 36 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 8a4b98054..05b305ef8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,10 +10,8 @@ edx-opaque-keys==2.5.1 # via -r requirements/base.in fs==2.4.16 # via -r requirements/base.in -lxml==4.9.4 - # via - # -c requirements/constraints.txt - # -r requirements/base.in +lxml==5.2.1 + # via -r requirements/base.in mako==1.3.3 # via -r requirements/base.in markupsafe==2.1.5 diff --git a/requirements/ci.txt b/requirements/ci.txt index 87efe7989..ce98b2013 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -26,7 +26,7 @@ platformdirs==4.2.0 # via # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox pyproject-api==1.6.1 # via tox @@ -36,5 +36,5 @@ tomli==2.0.1 # tox tox==4.14.2 # via -r requirements/ci.in -virtualenv==20.25.1 +virtualenv==20.25.3 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 8a708647d..2150294b1 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django -boto3==1.34.84 +boto3==1.34.88 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.84 +botocore==1.34.88 # via # -r requirements/test.txt # boto3 @@ -98,7 +98,7 @@ edx-lint==5.3.6 # via -r requirements/test.txt edx-opaque-keys==2.5.1 # via -r requirements/test.txt -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # -r requirements/test.txt # hypothesis @@ -156,10 +156,8 @@ jmespath==1.0.1 # botocore lazy==1.6 # via -r requirements/test.txt -lxml==4.9.4 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt +lxml==5.2.1 + # via -r requirements/test.txt mako==1.3.3 # via -r requirements/test.txt markupsafe==2.1.5 @@ -203,7 +201,7 @@ platformdirs==4.2.0 # pylint # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -341,7 +339,7 @@ urllib3==1.26.18 # via # -r requirements/test.txt # botocore -virtualenv==20.25.1 +virtualenv==20.25.3 # via # -r requirements/ci.txt # -r requirements/test.txt diff --git a/requirements/django.txt b/requirements/django.txt index 4175717c8..b7e2f55c1 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.in # django -boto3==1.34.84 +boto3==1.34.88 # via fs-s3fs -botocore==1.34.84 +botocore==1.34.88 # via # boto3 # s3transfer @@ -40,10 +40,8 @@ jmespath==1.0.1 # botocore lazy==1.6 # via -r requirements/django.in -lxml==4.9.4 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt +lxml==5.2.1 + # via -r requirements/base.txt mako==1.3.3 # via -r requirements/base.txt markupsafe==2.1.5 diff --git a/requirements/doc.txt b/requirements/doc.txt index 78fad9e82..4bcca580d 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -26,11 +26,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # django beautifulsoup4==4.12.3 # via pydata-sphinx-theme -boto3==1.34.84 +boto3==1.34.88 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.84 +botocore==1.34.88 # via # -r requirements/django.txt # boto3 @@ -76,10 +76,8 @@ jmespath==1.0.1 # botocore lazy==1.6 # via -r requirements/django.txt -lxml==4.9.4 - # via - # -c requirements/constraints.txt - # -r requirements/django.txt +lxml==5.2.1 + # via -r requirements/django.txt mako==1.3.3 # via -r requirements/django.txt markupsafe==2.1.5 diff --git a/requirements/test.txt b/requirements/test.txt index 7af0264bc..b3b53c635 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,11 +23,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.txt # django -boto3==1.34.84 +boto3==1.34.88 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.84 +botocore==1.34.88 # via # -r requirements/django.txt # boto3 @@ -69,7 +69,7 @@ edx-lint==5.3.6 # via -r requirements/test.in edx-opaque-keys==2.5.1 # via -r requirements/django.txt -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # hypothesis # pytest @@ -112,10 +112,8 @@ jmespath==1.0.1 # botocore lazy==1.6 # via -r requirements/django.txt -lxml==4.9.4 - # via - # -c requirements/constraints.txt - # -r requirements/django.txt +lxml==5.2.1 + # via -r requirements/django.txt mako==1.3.3 # via -r requirements/django.txt markupsafe==2.1.5 @@ -147,7 +145,7 @@ platformdirs==4.2.0 # pylint # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # diff-cover # pytest @@ -250,7 +248,7 @@ urllib3==1.26.18 # via # -r requirements/django.txt # botocore -virtualenv==20.25.1 +virtualenv==20.25.3 # via tox web-fragments==2.2.0 # via -r requirements/django.txt From dc22784e2f538ce9fcc36eff5774db01fad91f81 Mon Sep 17 00:00:00 2001 From: Irtaza Akram <51848298+irtazaakram@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:45:49 +0500 Subject: [PATCH 5/7] chore: bump version (#745) --- CHANGELOG.rst | 5 +++++ xblock/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f5c4e4a5c..7b8b89c1f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,11 @@ Change history for XBlock Unreleased ---------- +4.0.1 - 2024-04-24 +------------------ + +* unpin lxml constraint. + 4.0.0 - 2024-04-18 ------------------ diff --git a/xblock/__init__.py b/xblock/__init__.py index ff55f6857..92ec4254f 100644 --- a/xblock/__init__.py +++ b/xblock/__init__.py @@ -2,4 +2,4 @@ XBlock Courseware Components """ -__version__ = '4.0.0' +__version__ = '4.0.1' From 008187bf7f8b40f2326867d3f7e0a19be62e3fe5 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Tue, 30 Apr 2024 02:45:57 -0400 Subject: [PATCH 6/7] Python Requirements Update (#746) * chore: Updating Python Requirements * build: Update codecov to use the repository upload token. --------- Co-authored-by: Irtaza Akram --- .github/workflows/ci.yml | 3 ++- requirements/base.txt | 6 ++++-- requirements/ci.txt | 8 ++++---- requirements/dev.txt | 24 ++++++++++++++---------- requirements/django.txt | 12 ++++++++---- requirements/doc.txt | 12 ++++++++---- requirements/test.txt | 24 ++++++++++++++---------- 7 files changed, 54 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b069265e..833b7fea7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,8 @@ jobs: - name: Run Coverage if: matrix.python-version == '3.8' && matrix.toxenv == 'django42' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: flags: unittests fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/requirements/base.txt b/requirements/base.txt index 05b305ef8..4624577e5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,9 @@ # appdirs==1.4.4 # via fs -edx-opaque-keys==2.5.1 +dnspython==2.6.1 + # via pymongo +edx-opaque-keys==2.9.0 # via -r requirements/base.in fs==2.4.16 # via -r requirements/base.in @@ -20,7 +22,7 @@ markupsafe==2.1.5 # mako pbr==6.0.0 # via stevedore -pymongo==3.13.0 +pymongo==4.4.0 # via edx-opaque-keys python-dateutil==2.9.0.post0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index ce98b2013..4530829f4 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,7 +10,7 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.4.4 +coverage==7.5.0 # via -r requirements/ci.in distlib==0.3.8 # via virtualenv @@ -22,7 +22,7 @@ packaging==24.0 # via # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.2.1 # via # tox # virtualenv @@ -34,7 +34,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.14.2 +tox==4.15.0 # via -r requirements/ci.in -virtualenv==20.25.3 +virtualenv==20.26.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 2150294b1..685c4e5da 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django -boto3==1.34.88 +boto3==1.34.93 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # -r requirements/test.txt # boto3 @@ -69,7 +69,7 @@ colorama==0.4.6 # -r requirements/ci.txt # -r requirements/test.txt # tox -coverage[toml]==7.4.4 +coverage[toml]==7.5.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -94,9 +94,13 @@ django==4.2.11 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # openedx-django-pyfs +dnspython==2.6.1 + # via + # -r requirements/test.txt + # pymongo edx-lint==5.3.6 # via -r requirements/test.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.9.0 # via -r requirements/test.txt exceptiongroup==1.2.1 # via @@ -127,7 +131,7 @@ importlib-metadata==6.11.0 # -r requirements/test.txt # build # typeguard -inflect==7.2.0 +inflect==7.2.1 # via # -r requirements/test.txt # jinja2-pluralize @@ -194,7 +198,7 @@ pbr==6.0.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.0 +platformdirs==4.2.1 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -234,7 +238,7 @@ pylint-plugin-utils==0.8.2 # -r requirements/test.txt # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/test.txt # edx-opaque-keys @@ -248,7 +252,7 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/test.txt # pytest-cov @@ -318,7 +322,7 @@ tomlkit==0.12.4 # via # -r requirements/test.txt # pylint -tox==4.14.2 +tox==4.15.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -339,7 +343,7 @@ urllib3==1.26.18 # via # -r requirements/test.txt # botocore -virtualenv==20.25.3 +virtualenv==20.26.0 # via # -r requirements/ci.txt # -r requirements/test.txt diff --git a/requirements/django.txt b/requirements/django.txt index b7e2f55c1..2109ccc92 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.in # django -boto3==1.34.88 +boto3==1.34.93 # via fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # boto3 # s3transfer @@ -25,7 +25,11 @@ django==4.2.11 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.in # openedx-django-pyfs -edx-opaque-keys==2.5.1 +dnspython==2.6.1 + # via + # -r requirements/base.txt + # pymongo +edx-opaque-keys==2.9.0 # via -r requirements/base.txt fs==2.4.16 # via @@ -54,7 +58,7 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/base.txt # edx-opaque-keys diff --git a/requirements/doc.txt b/requirements/doc.txt index 4bcca580d..6c13476a7 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -26,11 +26,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # django beautifulsoup4==4.12.3 # via pydata-sphinx-theme -boto3==1.34.88 +boto3==1.34.93 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # -r requirements/django.txt # boto3 @@ -44,11 +44,15 @@ django==4.2.11 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.txt # openedx-django-pyfs +dnspython==2.6.1 + # via + # -r requirements/django.txt + # pymongo docutils==0.19 # via # pydata-sphinx-theme # sphinx -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.9.0 # via -r requirements/django.txt fs==2.4.16 # via @@ -104,7 +108,7 @@ pygments==2.17.2 # accessible-pygments # pydata-sphinx-theme # sphinx -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/django.txt # edx-opaque-keys diff --git a/requirements/test.txt b/requirements/test.txt index b3b53c635..4ba5c291a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,11 +23,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.txt # django -boto3==1.34.88 +boto3==1.34.93 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # -r requirements/django.txt # boto3 @@ -47,7 +47,7 @@ code-annotations==1.8.0 # via edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.4.4 +coverage[toml]==7.5.0 # via # -r requirements/test.in # pytest-cov @@ -65,9 +65,13 @@ distlib==0.3.8 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.txt # openedx-django-pyfs +dnspython==2.6.1 + # via + # -r requirements/django.txt + # pymongo edx-lint==5.3.6 # via -r requirements/test.in -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.9.0 # via -r requirements/django.txt exceptiongroup==1.2.1 # via @@ -92,7 +96,7 @@ importlib-metadata==6.11.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # typeguard -inflect==7.2.0 +inflect==7.2.1 # via jinja2-pluralize iniconfig==2.0.0 # via pytest @@ -140,7 +144,7 @@ pbr==6.0.0 # via # -r requirements/django.txt # stevedore -platformdirs==4.2.0 +platformdirs==4.2.1 # via # pylint # tox @@ -169,13 +173,13 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/django.txt # edx-opaque-keys pyproject-api==1.6.1 # via tox -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/test.in # pytest-cov @@ -231,7 +235,7 @@ tomli==2.0.1 # tox tomlkit==0.12.4 # via pylint -tox==4.14.2 +tox==4.15.0 # via -r requirements/test.in typeguard==4.2.1 # via inflect @@ -248,7 +252,7 @@ urllib3==1.26.18 # via # -r requirements/django.txt # botocore -virtualenv==20.25.3 +virtualenv==20.26.0 # via tox web-fragments==2.2.0 # via -r requirements/django.txt From 99e4d33fb882c81cbb03fee8991e609cb3590616 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sat, 4 May 2024 20:10:18 -0400 Subject: [PATCH 7/7] chore: Updating Python Requirements --- requirements/ci.txt | 6 +++--- requirements/dev.txt | 17 ++++++++--------- requirements/django.txt | 4 ++-- requirements/doc.txt | 6 +++--- requirements/pip-tools.txt | 3 +-- requirements/test.txt | 14 +++++++------- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 4530829f4..dd2bd2cd2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,11 +10,11 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.5.0 +coverage==7.5.1 # via -r requirements/ci.in distlib==0.3.8 # via virtualenv -filelock==3.13.4 +filelock==3.14.0 # via # tox # virtualenv @@ -36,5 +36,5 @@ tomli==2.0.1 # tox tox==4.15.0 # via -r requirements/ci.in -virtualenv==20.26.0 +virtualenv==20.26.1 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 685c4e5da..575383b43 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django -boto3==1.34.93 +boto3==1.34.98 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.93 +botocore==1.34.98 # via # -r requirements/test.txt # boto3 @@ -69,7 +69,7 @@ colorama==0.4.6 # -r requirements/ci.txt # -r requirements/test.txt # tox -coverage[toml]==7.5.0 +coverage[toml]==7.5.1 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -107,7 +107,7 @@ exceptiongroup==1.2.1 # -r requirements/test.txt # hypothesis # pytest -filelock==3.13.4 +filelock==3.14.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -122,7 +122,7 @@ fs-s3fs==1.1.1 # via # -r requirements/test.txt # openedx-django-pyfs -hypothesis==6.100.1 +hypothesis==6.100.4 # via -r requirements/test.txt importlib-metadata==6.11.0 # via @@ -214,7 +214,7 @@ pluggy==1.5.0 # tox pycodestyle==2.11.1 # via -r requirements/test.txt -pygments==2.17.2 +pygments==2.18.0 # via # -r requirements/test.txt # diff-cover @@ -247,7 +247,7 @@ pyproject-api==1.6.1 # -r requirements/ci.txt # -r requirements/test.txt # tox -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # -r requirements/pip-tools.txt # build @@ -315,7 +315,6 @@ tomli==2.0.1 # pip-tools # pylint # pyproject-api - # pyproject-hooks # pytest # tox tomlkit==0.12.4 @@ -343,7 +342,7 @@ urllib3==1.26.18 # via # -r requirements/test.txt # botocore -virtualenv==20.26.0 +virtualenv==20.26.1 # via # -r requirements/ci.txt # -r requirements/test.txt diff --git a/requirements/django.txt b/requirements/django.txt index 2109ccc92..29bf77716 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.in # django -boto3==1.34.93 +boto3==1.34.98 # via fs-s3fs -botocore==1.34.93 +botocore==1.34.98 # via # boto3 # s3transfer diff --git a/requirements/doc.txt b/requirements/doc.txt index 6c13476a7..91fbda836 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -26,11 +26,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # django beautifulsoup4==4.12.3 # via pydata-sphinx-theme -boto3==1.34.93 +boto3==1.34.98 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.93 +botocore==1.34.98 # via # -r requirements/django.txt # boto3 @@ -103,7 +103,7 @@ pbr==6.0.0 # stevedore pydata-sphinx-theme==0.14.4 # via sphinx-book-theme -pygments==2.17.2 +pygments==2.18.0 # via # accessible-pygments # pydata-sphinx-theme diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 748bf44e6..3f056281e 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -16,7 +16,7 @@ packaging==24.0 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools @@ -24,7 +24,6 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks wheel==0.43.0 # via pip-tools zipp==3.18.1 diff --git a/requirements/test.txt b/requirements/test.txt index 4ba5c291a..0a2fcba6f 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,11 +23,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.txt # django -boto3==1.34.93 +boto3==1.34.98 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.93 +botocore==1.34.98 # via # -r requirements/django.txt # boto3 @@ -47,7 +47,7 @@ code-annotations==1.8.0 # via edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.5.0 +coverage[toml]==7.5.1 # via # -r requirements/test.in # pytest-cov @@ -77,7 +77,7 @@ exceptiongroup==1.2.1 # via # hypothesis # pytest -filelock==3.13.4 +filelock==3.14.0 # via # tox # virtualenv @@ -90,7 +90,7 @@ fs-s3fs==1.1.1 # via # -r requirements/django.txt # openedx-django-pyfs -hypothesis==6.100.1 +hypothesis==6.100.4 # via -r requirements/test.in importlib-metadata==6.11.0 # via @@ -156,7 +156,7 @@ pluggy==1.5.0 # tox pycodestyle==2.11.1 # via -r requirements/test.in -pygments==2.17.2 +pygments==2.18.0 # via diff-cover pylint==3.1.0 # via @@ -252,7 +252,7 @@ urllib3==1.26.18 # via # -r requirements/django.txt # botocore -virtualenv==20.26.0 +virtualenv==20.26.1 # via tox web-fragments==2.2.0 # via -r requirements/django.txt