Merge branch 'master' into patch-1

openedx · Apr 25, 2024 · c22dafd · c22dafd
2 parents 1247703 + dc22784
commit c22dafd
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 38 deletions.
diff --git 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/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
@@ -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/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 
diff --git 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
@@ -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
@@ -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
@@ -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

diff --git a/xblock/__init__.py b/xblock/__init__.py
@@ -2,4 +2,4 @@
 XBlock Courseware Components
 """
 
-__version__ = '4.0.0'
+__version__ = '4.0.1'