From 5cd0f6686baac9c76544502f4aea0f2468e48bd6 Mon Sep 17 00:00:00 2001 From: farhan Date: Mon, 22 Apr 2024 16:21:29 +0500 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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'