From 34895c796f6f169b12165d1922502c5b8260e916 Mon Sep 17 00:00:00 2001 From: farhan Date: Fri, 6 Oct 2023 19:41:17 +0500 Subject: [PATCH 1/2] refactor: remove xblockutils package --- done/done.py | 2 +- requirements/base.in | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/done/done.py b/done/done.py index ab9e407..882d1e5 100644 --- a/done/done.py +++ b/done/done.py @@ -9,7 +9,7 @@ from web_fragments.fragment import Fragment from xblock.core import XBlock from xblock.fields import Boolean, DateTime, Float, Scope, String -from xblockutils.resources import ResourceLoader +from xblock.utils.resources import ResourceLoader resource_loader = ResourceLoader(__name__) diff --git a/requirements/base.in b/requirements/base.in index 7b369f7..2276f26 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -2,5 +2,4 @@ -c constraints.txt XBlock -xblock-utils django From 40637aef22902afe80d50bb730a7413f7edd3a1b Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Mon, 9 Oct 2023 01:05:19 -0400 Subject: [PATCH 2/2] chore: Updating Python Requirements --- requirements/base.txt | 47 ++++------------------------------ requirements/ci.txt | 19 +------------- requirements/dev.txt | 48 +---------------------------------- requirements/docs.txt | 54 +++------------------------------------- requirements/quality.txt | 34 +++---------------------- requirements/test.txt | 34 +++---------------------- 6 files changed, 19 insertions(+), 217 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ebecbf2..a0e4de9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,80 +8,43 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.28.62 - # via fs-s3fs -botocore==1.31.62 - # via - # boto3 - # s3transfer django==3.2.22 # via # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in - # openedx-django-pyfs fs==2.4.16 - # via - # fs-s3fs - # openedx-django-pyfs - # xblock -fs-s3fs==1.1.1 - # via openedx-django-pyfs -jmespath==1.0.1 - # via - # boto3 - # botocore -lazy==1.6 # via xblock lxml==4.9.3 # via xblock mako==1.2.4 - # via - # xblock - # xblock-utils + # via xblock markupsafe==2.1.3 # via # mako # xblock -openedx-django-pyfs==3.4.0 - # via xblock python-dateutil==2.8.2 - # via - # botocore - # xblock + # via xblock pytz==2023.3.post1 # via # django # xblock pyyaml==6.0.1 # via xblock -s3transfer==0.7.0 - # via boto3 simplejson==3.19.2 - # via - # xblock - # xblock-utils + # via xblock six==1.16.0 # via # fs - # fs-s3fs # python-dateutil sqlparse==0.4.4 # via django typing-extensions==4.8.0 # via asgiref -urllib3==1.26.17 - # via botocore web-fragments==2.1.0 - # via - # xblock - # xblock-utils + # via xblock webob==1.8.7 # via xblock -xblock[django]==1.8.1 - # via - # -r requirements/base.in - # xblock-utils -xblock-utils==4.0.0 +xblock==1.8.1 # 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 60825de..beb9a33 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -93,7 +93,6 @@ django==3.2.22 # via # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk docopt==0.6.2 # via @@ -118,12 +117,10 @@ fs==2.4.16 # via # -r requirements/test.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk idna==3.4 # via @@ -169,10 +166,6 @@ keyring==24.2.0 # via # -r requirements/test.txt # twine -lazy==1.6 - # via - # -r requirements/test.txt - # xblock lazy-object-proxy==1.9.0 # via # -r requirements/test.txt @@ -186,7 +179,6 @@ mako==1.2.4 # via # -r requirements/test.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via # -r requirements/test.txt @@ -213,10 +205,6 @@ nh3==0.2.14 # via # -r requirements/test.txt # readme-renderer -openedx-django-pyfs==3.4.0 - # via - # -r requirements/test.txt - # xblock packaging==23.2 # via # -r requirements/test.txt @@ -342,7 +330,6 @@ simplejson==3.19.2 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/test.txt @@ -407,7 +394,6 @@ web-fragments==2.1.0 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/test.txt @@ -417,15 +403,12 @@ wrapt==1.15.0 # via # -r requirements/test.txt # astroid -xblock[django]==1.8.1 +xblock==1.8.1 # via # -r requirements/test.txt # xblock-sdk - # xblock-utils xblock-sdk==0.7.0 # via -r requirements/test.txt -xblock-utils==4.0.0 - # via -r requirements/test.txt zipp==3.17.0 # via # -r requirements/test.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 8d4e376..95f0ece 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,38 +12,13 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -boto3==1.28.62 - # via - # -r requirements/base.txt - # fs-s3fs -botocore==1.31.62 - # via - # -r requirements/base.txt - # boto3 - # s3transfer django==3.2.22 # via # -r requirements/base.txt # edx-i18n-tools - # openedx-django-pyfs edx-i18n-tools==1.3.0 # via -r requirements/dev.in fs==2.4.16 - # via - # -r requirements/base.txt - # fs-s3fs - # openedx-django-pyfs - # xblock -fs-s3fs==1.1.1 - # via - # -r requirements/base.txt - # openedx-django-pyfs -jmespath==1.0.1 - # via - # -r requirements/base.txt - # boto3 - # botocore -lazy==1.6 # via # -r requirements/base.txt # xblock @@ -56,16 +31,11 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock - # xblock-utils markupsafe==2.1.3 # via # -r requirements/base.txt # mako # xblock -openedx-django-pyfs==3.4.0 - # via - # -r requirements/base.txt - # xblock path==16.7.1 # via edx-i18n-tools polib==1.2.0 @@ -73,7 +43,6 @@ polib==1.2.0 python-dateutil==2.8.2 # via # -r requirements/base.txt - # botocore # xblock pytz==2023.3.post1 # via @@ -85,20 +54,14 @@ pyyaml==6.0.1 # -r requirements/base.txt # edx-i18n-tools # xblock -s3transfer==0.7.0 - # via - # -r requirements/base.txt - # boto3 simplejson==3.19.2 # via # -r requirements/base.txt # xblock - # xblock-utils six==1.16.0 # via # -r requirements/base.txt # fs - # fs-s3fs # python-dateutil sqlparse==0.4.4 # via @@ -108,24 +71,15 @@ typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref -urllib3==1.26.17 - # via - # -r requirements/base.txt - # botocore web-fragments==2.1.0 # via # -r requirements/base.txt # xblock - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt # xblock -xblock[django]==1.8.1 - # via - # -r requirements/base.txt - # xblock-utils -xblock-utils==4.0.0 +xblock==1.8.1 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/docs.txt b/requirements/docs.txt index abc1775..09204f2 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -22,23 +22,12 @@ babel==2.13.0 # sphinx beautifulsoup4==4.12.2 # via pydata-sphinx-theme -boto3==1.28.62 - # via - # -r requirements/base.txt - # fs-s3fs -botocore==1.31.62 - # via - # -r requirements/base.txt - # boto3 - # s3transfer certifi==2023.7.22 # via requests charset-normalizer==3.3.0 # via requests django==3.2.22 - # via - # -r requirements/base.txt - # openedx-django-pyfs + # via -r requirements/base.txt docutils==0.19 # via # pydata-sphinx-theme @@ -46,13 +35,7 @@ docutils==0.19 fs==2.4.16 # via # -r requirements/base.txt - # fs-s3fs - # openedx-django-pyfs # xblock -fs-s3fs==1.1.1 - # via - # -r requirements/base.txt - # openedx-django-pyfs idna==3.4 # via requests imagesize==1.4.1 @@ -61,15 +44,6 @@ importlib-metadata==6.8.0 # via sphinx jinja2==3.1.2 # via sphinx -jmespath==1.0.1 - # via - # -r requirements/base.txt - # boto3 - # botocore -lazy==1.6 - # via - # -r requirements/base.txt - # xblock lxml==4.9.3 # via # -r requirements/base.txt @@ -78,17 +52,12 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock - # xblock-utils markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 # mako # xblock -openedx-django-pyfs==3.4.0 - # via - # -r requirements/base.txt - # xblock packaging==23.2 # via # pydata-sphinx-theme @@ -103,7 +72,6 @@ pygments==2.16.1 python-dateutil==2.8.2 # via # -r requirements/base.txt - # botocore # xblock pytz==2023.3.post1 # via @@ -117,20 +85,14 @@ pyyaml==6.0.1 # xblock requests==2.31.0 # via sphinx -s3transfer==0.7.0 - # via - # -r requirements/base.txt - # boto3 simplejson==3.19.2 # via # -r requirements/base.txt # xblock - # xblock-utils six==1.16.0 # via # -r requirements/base.txt # fs - # fs-s3fs # python-dateutil snowballstemmer==2.2.0 # via sphinx @@ -164,25 +126,17 @@ typing-extensions==4.8.0 # -r requirements/base.txt # asgiref # pydata-sphinx-theme -urllib3==1.26.17 - # via - # -r requirements/base.txt - # botocore - # requests +urllib3==2.0.6 + # via requests web-fragments==2.1.0 # via # -r requirements/base.txt # xblock - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt # xblock -xblock[django]==1.8.1 - # via - # -r requirements/base.txt - # xblock-utils -xblock-utils==4.0.0 +xblock==1.8.1 # via -r requirements/base.txt zipp==3.17.0 # via importlib-metadata diff --git a/requirements/quality.txt b/requirements/quality.txt index e43502e..3d026c4 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -21,12 +21,9 @@ astroid==2.15.8 binaryornot==0.4.4 # via cookiecutter boto3==1.28.62 - # via - # -r requirements/base.txt - # fs-s3fs + # via fs-s3fs botocore==1.31.62 # via - # -r requirements/base.txt # boto3 # s3transfer certifi==2023.7.22 @@ -55,7 +52,6 @@ django==3.2.22 # via # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt - # openedx-django-pyfs # xblock-sdk edx-lint==5.3.4 # via -r requirements/quality.in @@ -63,13 +59,9 @@ fs==2.4.16 # via # -r requirements/base.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via - # -r requirements/base.txt - # openedx-django-pyfs - # xblock-sdk + # via xblock-sdk idna==3.4 # via requests isort==5.12.0 @@ -80,13 +72,8 @@ jinja2==3.1.2 # cookiecutter jmespath==1.0.1 # via - # -r requirements/base.txt # boto3 # botocore -lazy==1.6 - # via - # -r requirements/base.txt - # xblock lazy-object-proxy==1.9.0 # via astroid lxml==4.9.3 @@ -98,7 +85,6 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via rich markupsafe==2.1.3 @@ -111,10 +97,6 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -openedx-django-pyfs==3.4.0 - # via - # -r requirements/base.txt - # xblock pbr==5.11.1 # via stevedore platformdirs==3.11.0 @@ -168,15 +150,12 @@ requests==2.31.0 rich==13.6.0 # via cookiecutter s3transfer==0.7.0 - # via - # -r requirements/base.txt - # boto3 + # via boto3 simplejson==3.19.2 # via # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -207,7 +186,6 @@ typing-extensions==4.8.0 # rich urllib3==1.26.17 # via - # -r requirements/base.txt # botocore # requests web-fragments==2.1.0 @@ -215,7 +193,6 @@ web-fragments==2.1.0 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt @@ -223,15 +200,12 @@ webob==1.8.7 # xblock-sdk wrapt==1.15.0 # via astroid -xblock[django]==1.8.1 +xblock==1.8.1 # via # -r requirements/base.txt # xblock-sdk - # xblock-utils xblock-sdk==0.7.0 # via -r requirements/quality.in -xblock-utils==4.0.0 - # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 0cb0108..156f878 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -21,12 +21,9 @@ astroid==2.15.8 binaryornot==0.4.4 # via cookiecutter boto3==1.28.62 - # via - # -r requirements/base.txt - # fs-s3fs + # via fs-s3fs botocore==1.31.62 # via - # -r requirements/base.txt # boto3 # s3transfer certifi==2023.7.22 @@ -62,7 +59,6 @@ dill==0.3.7 # via # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt - # openedx-django-pyfs # xblock-sdk docopt==0.6.2 # via coveralls @@ -76,13 +72,9 @@ fs==2.4.16 # via # -r requirements/base.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via - # -r requirements/base.txt - # openedx-django-pyfs - # xblock-sdk + # via xblock-sdk idna==3.4 # via requests importlib-metadata==6.8.0 @@ -107,15 +99,10 @@ jinja2==3.1.2 # cookiecutter jmespath==1.0.1 # via - # -r requirements/base.txt # boto3 # botocore keyring==24.2.0 # via twine -lazy==1.6 - # via - # -r requirements/base.txt - # xblock lazy-object-proxy==1.9.0 # via astroid lxml==4.9.3 @@ -127,7 +114,6 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via rich markupsafe==2.1.3 @@ -144,10 +130,6 @@ more-itertools==10.1.0 # via jaraco-classes nh3==0.2.14 # via readme-renderer -openedx-django-pyfs==3.4.0 - # via - # -r requirements/base.txt - # xblock packaging==23.2 # via pytest pbr==5.11.1 @@ -221,9 +203,7 @@ rich==13.6.0 # cookiecutter # twine s3transfer==0.7.0 - # via - # -r requirements/base.txt - # boto3 + # via boto3 secretstorage==3.3.3 # via keyring simplejson==3.19.2 @@ -231,7 +211,6 @@ simplejson==3.19.2 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -266,7 +245,6 @@ typing-extensions==4.8.0 # rich urllib3==1.26.17 # via - # -r requirements/base.txt # botocore # requests # twine @@ -275,7 +253,6 @@ web-fragments==2.1.0 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt @@ -283,15 +260,12 @@ webob==1.8.7 # xblock-sdk wrapt==1.15.0 # via astroid -xblock[django]==1.8.1 +xblock==1.8.1 # via # -r requirements/base.txt # xblock-sdk - # xblock-utils xblock-sdk==0.7.0 # via -r requirements/test.in -xblock-utils==4.0.0 - # via -r requirements/base.txt zipp==3.17.0 # via # importlib-metadata