From ceb96142732e3cf9b3f5f9b5e13d4ce7e10fbcf6 Mon Sep 17 00:00:00 2001 From: farhan Date: Tue, 10 Oct 2023 11:29:55 +0500 Subject: [PATCH 1/2] refactor: remove xblock-utils package --- feedback/feedback.py | 2 +- requirements/base.in | 3 +-- requirements/test.in | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/feedback/feedback.py b/feedback/feedback.py index b449e4a..5eb48a5 100644 --- a/feedback/feedback.py +++ b/feedback/feedback.py @@ -14,7 +14,7 @@ from xblock.core import XBlock from xblock.fields import Scope, Integer, String, List, Float from web_fragments.fragment import Fragment -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 142bf45..f659a42 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,5 +1,4 @@ # Core requirements for using this package -c constraints.txt -XBlock -xblock-utils +Xblock[django] diff --git a/requirements/test.in b/requirements/test.in index 53cceab..2a6066c 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -12,4 +12,3 @@ pytest pytest-django twine xblock-sdk -xblock-utils From 92f93fc17f17f2ceffa306c9f3237ab030959f79 Mon Sep 17 00:00:00 2001 From: farhan Date: Thu, 19 Oct 2023 09:51:35 +0500 Subject: [PATCH 2/2] chore: Upgrading python requirements --- requirements/base.txt | 22 ++++++---------------- requirements/ci.txt | 33 +++------------------------------ requirements/dev.txt | 12 +++--------- requirements/docs.txt | 12 +++--------- requirements/quality.txt | 24 +++--------------------- requirements/test.txt | 26 +++----------------------- 6 files changed, 21 insertions(+), 108 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ca66613..a12cdbd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.28.63 +boto3==1.28.66 # via fs-s3fs -botocore==1.31.63 +botocore==1.31.66 # via # boto3 # s3transfer @@ -34,9 +34,7 @@ lazy==1.6 lxml==4.9.3 # via xblock mako==1.2.4 - # via - # xblock - # xblock-utils + # via xblock markupsafe==2.1.3 # via # mako @@ -56,9 +54,7 @@ pyyaml==6.0.1 s3transfer==0.7.0 # via boto3 simplejson==3.19.2 - # via - # xblock - # xblock-utils + # via xblock six==1.16.0 # via # fs @@ -68,19 +64,13 @@ sqlparse==0.4.4 # via django typing-extensions==4.8.0 # via asgiref -urllib3==1.26.17 +urllib3==1.26.18 # 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 # 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 3ca9918..d0eece2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -25,11 +25,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.28.63 +boto3==1.28.66 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.66 # via # -r requirements/test.txt # boto3 @@ -38,10 +38,6 @@ certifi==2023.7.22 # via # -r requirements/test.txt # requests -cffi==1.16.0 - # via - # -r requirements/test.txt - # cryptography chardet==5.2.0 # via # -r requirements/test.txt @@ -75,10 +71,6 @@ coverage==6.5.0 # coveralls coveralls==3.3.1 # via -r requirements/test.txt -cryptography==41.0.4 - # via - # -r requirements/test.txt - # secretstorage ddt==1.6.0 # via -r requirements/test.txt dill==0.3.7 @@ -150,11 +142,6 @@ jaraco-classes==3.3.0 # via # -r requirements/test.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/test.txt - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt @@ -186,7 +173,6 @@ mako==1.2.4 # via # -r requirements/test.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via # -r requirements/test.txt @@ -251,10 +237,6 @@ py==1.11.0 # tox pycodestyle==2.11.1 # via -r requirements/test.txt -pycparser==2.21 - # via - # -r requirements/test.txt - # cffi pygments==2.16.1 # via # -r requirements/test.txt @@ -341,16 +323,11 @@ s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.3 - # via - # -r requirements/test.txt - # keyring simplejson==3.19.2 # via # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/test.txt @@ -400,7 +377,7 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/test.txt # botocore @@ -415,7 +392,6 @@ web-fragments==2.1.0 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/test.txt @@ -430,11 +406,8 @@ xblock[django]==1.8.1 # -r requirements/test.txt # xblock # 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 d9e581c..d4c5cff 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,11 +12,11 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -boto3==1.28.63 +boto3==1.28.66 # via # -r requirements/base.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.66 # via # -r requirements/base.txt # boto3 @@ -56,7 +56,6 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock - # xblock-utils markupsafe==2.1.3 # via # -r requirements/base.txt @@ -93,7 +92,6 @@ simplejson==3.19.2 # via # -r requirements/base.txt # xblock - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -108,7 +106,7 @@ typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/base.txt # botocore @@ -116,7 +114,6 @@ web-fragments==2.1.0 # via # -r requirements/base.txt # xblock - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt @@ -125,9 +122,6 @@ xblock[django]==1.8.1 # via # -r requirements/base.txt # xblock - # xblock-utils -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/docs.txt b/requirements/docs.txt index ab1e228..de5cb2f 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -22,11 +22,11 @@ babel==2.13.0 # sphinx beautifulsoup4==4.12.2 # via pydata-sphinx-theme -boto3==1.28.63 +boto3==1.28.66 # via # -r requirements/base.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.66 # via # -r requirements/base.txt # boto3 @@ -78,7 +78,6 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock - # xblock-utils markupsafe==2.1.3 # via # -r requirements/base.txt @@ -125,7 +124,6 @@ simplejson==3.19.2 # via # -r requirements/base.txt # xblock - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -164,7 +162,7 @@ typing-extensions==4.8.0 # -r requirements/base.txt # asgiref # pydata-sphinx-theme -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/base.txt # botocore @@ -173,7 +171,6 @@ web-fragments==2.1.0 # via # -r requirements/base.txt # xblock - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt @@ -182,9 +179,6 @@ xblock[django]==1.8.1 # via # -r requirements/base.txt # xblock - # xblock-utils -xblock-utils==4.0.0 - # via -r requirements/base.txt zipp==3.17.0 # via importlib-metadata diff --git a/requirements/quality.txt b/requirements/quality.txt index db22606..ea1bef7 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -20,19 +20,17 @@ astroid==2.15.8 # pylint-celery binaryornot==0.4.4 # via cookiecutter -boto3==1.28.63 +boto3==1.28.66 # via # -r requirements/base.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.66 # via # -r requirements/base.txt # boto3 # s3transfer certifi==2023.7.22 # via requests -cffi==1.16.0 - # via cryptography chardet==5.2.0 # via binaryornot charset-normalizer==3.3.0 @@ -49,8 +47,6 @@ code-annotations==1.5.0 # via edx-lint cookiecutter==2.4.0 # via xblock-sdk -cryptography==41.0.4 - # via secretstorage ddt==1.6.0 # via -r requirements/quality.in dill==0.3.7 @@ -88,10 +84,6 @@ isort==5.12.0 # via pylint jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via # code-annotations @@ -118,7 +110,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 @@ -147,8 +138,6 @@ platformdirs==3.11.0 # via pylint pycodestyle==2.11.1 # via -r requirements/quality.in -pycparser==2.21 - # via cffi pygments==2.16.1 # via # readme-renderer @@ -211,14 +200,11 @@ s3transfer==0.7.0 # via # -r requirements/base.txt # boto3 -secretstorage==3.3.3 - # via keyring simplejson==3.19.2 # via # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -249,7 +235,7 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/base.txt # botocore @@ -260,7 +246,6 @@ web-fragments==2.1.0 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt @@ -273,11 +258,8 @@ xblock[django]==1.8.1 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils xblock-sdk==0.7.0 # via -r requirements/quality.in -xblock-utils==4.0.0 - # via -r requirements/base.txt zipp==3.17.0 # via # importlib-metadata diff --git a/requirements/test.txt b/requirements/test.txt index 53596d9..d9c4014 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -20,19 +20,17 @@ astroid==2.15.8 # pylint-celery binaryornot==0.4.4 # via cookiecutter -boto3==1.28.63 +boto3==1.28.66 # via # -r requirements/base.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.66 # via # -r requirements/base.txt # boto3 # s3transfer certifi==2023.7.22 # via requests -cffi==1.16.0 - # via cryptography chardet==5.2.0 # via binaryornot charset-normalizer==3.3.0 @@ -53,8 +51,6 @@ coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/test.in -cryptography==41.0.4 - # via secretstorage ddt==1.6.0 # via -r requirements/test.in dill==0.3.7 @@ -98,10 +94,6 @@ isort==5.12.0 # via pylint jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via # code-annotations @@ -128,7 +120,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 @@ -163,8 +154,6 @@ pluggy==1.3.0 # via pytest pycodestyle==2.11.1 # via -r requirements/test.in -pycparser==2.21 - # via cffi pygments==2.16.1 # via # readme-renderer @@ -233,14 +222,11 @@ s3transfer==0.7.0 # via # -r requirements/base.txt # boto3 -secretstorage==3.3.3 - # via keyring simplejson==3.19.2 # via # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -273,7 +259,7 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/base.txt # botocore @@ -284,7 +270,6 @@ web-fragments==2.1.0 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt @@ -297,13 +282,8 @@ xblock[django]==1.8.1 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils xblock-sdk==0.7.0 # via -r requirements/test.in -xblock-utils==4.0.0 - # via - # -r requirements/base.txt - # -r requirements/test.in zipp==3.17.0 # via # importlib-metadata