From 6353d3db11417b677005292ec068da296d479af9 Mon Sep 17 00:00:00 2001 From: nsprenkle Date: Mon, 19 Aug 2024 13:45:05 -0400 Subject: [PATCH 1/2] fix: unpin XBlock version --- requirements/constraints.txt | 4 ---- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 0a95e5c8a4cb..68fca6d13d01 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -136,7 +136,3 @@ django-storages<1.14.4 # We are pinning this until after all the smaller migrations get handled and then we can migrate this all at once. # Ticket to unpin: https://github.com/edx/edx-arch-experiments/issues/760 social-auth-app-django<=5.4.1 - -# Xblock==5.0.0 changed how entrypoints were loaded, breaking a workaround for overriding blocks. -# See ticket: https://github.com/openedx/XBlock/issues/777 -xblock[django]==4.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6a15216943f6..b49e6bff07dc 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1256,7 +1256,7 @@ webob==1.8.7 # xblock wrapt==1.16.0 # via -r requirements/edx/paver.txt -xblock[django]==4.0.1 +xblock[django]==5.1.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 8155169e33d3..0c437221bd9d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -2230,7 +2230,7 @@ wrapt==1.16.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # astroid -xblock[django]==4.0.1 +xblock[django]==5.1.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index bb81b7b71ac3..d106a1b7719e 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1547,7 +1547,7 @@ webob==1.8.7 # xblock wrapt==1.16.0 # via -r requirements/edx/base.txt -xblock[django]==4.0.1 +xblock[django]==5.1.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 18c988dfb622..fd31a2c6efed 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1644,7 +1644,7 @@ wrapt==1.16.0 # via # -r requirements/edx/base.txt # astroid -xblock[django]==4.0.1 +xblock[django]==5.1.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt From 7a9150413fb6782d6ab941d43c6560bedcded0d4 Mon Sep 17 00:00:00 2001 From: nsprenkle Date: Mon, 19 Aug 2024 17:52:47 -0400 Subject: [PATCH 2/2] chore: update requirement vias --- requirements/edx/base.txt | 1 - requirements/edx/development.txt | 1 - requirements/edx/doc.txt | 1 - requirements/edx/testing.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b49e6bff07dc..773fa291d08c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1258,7 +1258,6 @@ wrapt==1.16.0 # via -r requirements/edx/paver.txt xblock[django]==5.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in # acid-xblock # crowdsourcehinter-xblock diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 0c437221bd9d..791884fe3971 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -2232,7 +2232,6 @@ wrapt==1.16.0 # astroid xblock[django]==5.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # acid-xblock diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index d106a1b7719e..74572f48f101 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1549,7 +1549,6 @@ wrapt==1.16.0 # via -r requirements/edx/base.txt xblock[django]==5.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # acid-xblock # crowdsourcehinter-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index fd31a2c6efed..59866def7134 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1646,7 +1646,6 @@ wrapt==1.16.0 # astroid xblock[django]==5.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # acid-xblock # crowdsourcehinter-xblock