From ad53fc859bac2ca098879d4c1245f7696f337472 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 25 May 2023 15:51:41 +0500 Subject: [PATCH] feat!: Removed boto usage. Upgrading `django-pyfs` it has updated code from boto to boto3. --- CHANGELOG.rst | 5 ++++ requirements/base.in | 1 - requirements/base.txt | 26 ++++++++--------- requirements/ci.txt | 20 +++---------- requirements/dev.txt | 57 +++++++++++++++++++------------------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 +-- requirements/quality.txt | 54 ++++++++++++++++++------------------ requirements/test.txt | 42 +++++++++++++++------------- workbench/__init__.py | 2 +- 10 files changed, 103 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 01e2d16c..d8ef4628 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,11 @@ Change history for XBlock SDK These are notable changes in XBlock. +0.6.0 +----- +* Removed boto usage. +* openedx-django-pyf is now using boto3 to generate URL. + 0.5.0 ----- * Removed Django22, 30 and 31 support diff --git a/requirements/base.in b/requirements/base.in index aa7d86f3..3315f540 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -2,7 +2,6 @@ -c constraints.txt -boto cookiecutter Django fs-s3fs diff --git a/requirements/base.txt b/requirements/base.txt index b35fcacf..616902d3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,19 +8,17 @@ appdirs==1.4.4 # via fs arrow==1.2.3 # via jinja2-time -asgiref==3.6.0 +asgiref==3.7.2 # via django binaryornot==0.4.4 # via cookiecutter -boto==2.49.0 - # via -r requirements/base.in -boto3==1.26.109 +boto3==1.26.146 # via fs-s3fs -botocore==1.29.109 +botocore==1.29.146 # via # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.5.7 # via requests chardet==5.1.0 # via binaryornot @@ -30,7 +28,7 @@ click==8.1.3 # via cookiecutter cookiecutter==2.1.1 # via -r requirements/base.in -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -62,11 +60,11 @@ lxml==4.9.2 # via # -r requirements/base.in # xblock -markupsafe==2.1.2 +markupsafe==2.1.3 # via # jinja2 # xblock -openedx-django-pyfs==3.2.1 +openedx-django-pyfs==3.3.0 # via xblock pypng==0.20220715.0 # via -r requirements/base.in @@ -85,11 +83,11 @@ pyyaml==6.0 # via # cookiecutter # xblock -requests==2.28.2 +requests==2.31.0 # via # -r requirements/base.in # cookiecutter -s3transfer==0.6.0 +s3transfer==0.6.1 # via boto3 simplejson==3.19.1 # via -r requirements/base.in @@ -98,11 +96,13 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil -sqlparse==0.4.3 +sqlparse==0.4.4 # via django text-unidecode==1.3 # via python-slugify -urllib3==1.26.15 +typing-extensions==4.6.3 + # via asgiref +urllib3==1.26.16 # via # botocore # requests diff --git a/requirements/ci.txt b/requirements/ci.txt index f0aec590..69be81b0 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,30 +4,20 @@ # # make upgrade # -certifi==2022.12.7 - # via requests -charset-normalizer==3.1.0 - # via requests -coverage==7.2.3 - # via codecov distlib==0.3.6 # via virtualenv -filelock==3.11.0 +filelock==3.12.0 # via # tox # virtualenv -idna==3.4 - # via requests -packaging==23.0 +packaging==23.1 # via tox -platformdirs==3.2.0 +platformdirs==3.5.1 # via virtualenv pluggy==1.0.0 # via tox py==1.11.0 # via tox -requests==2.28.2 - # via codecov six==1.16.0 # via tox tomli==2.0.1 @@ -39,7 +29,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -urllib3==1.26.15 - # via requests -virtualenv==20.21.0 +virtualenv==20.23.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 928f4d82..c7293f1f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -18,12 +18,12 @@ arrow==1.2.3 # -r requirements/base.txt # -r requirements/test.txt # jinja2-time -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # -r requirements/test.txt # django -astroid==2.15.2 +astroid==2.15.5 # via # pylint # pylint-celery @@ -36,22 +36,18 @@ bok-choy==0.7.1 # via # -r requirements/test.in # -r requirements/test.txt -boto==2.49.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt -boto3==1.26.109 +boto3==1.26.146 # via # -r requirements/base.txt # -r requirements/test.txt # fs-s3fs -botocore==1.29.109 +botocore==1.29.146 # via # -r requirements/base.txt # -r requirements/test.txt # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.5.7 # via # -r requirements/base.txt # -r requirements/test.txt @@ -82,7 +78,7 @@ cookiecutter==2.1.1 # via # -r requirements/base.txt # -r requirements/test.txt -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via # -r requirements/test.in # -r requirements/test.txt @@ -97,7 +93,7 @@ distlib==0.3.6 # via # -r requirements/test.txt # virtualenv -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -109,7 +105,7 @@ exceptiongroup==1.1.1 # via # -r requirements/test.txt # pytest -filelock==3.11.0 +filelock==3.12.0 # via # -r requirements/test.txt # tox @@ -175,7 +171,7 @@ mako==1.2.4 # via # -r requirements/test.txt # acid-xblock -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/base.txt # -r requirements/test.txt @@ -184,7 +180,7 @@ markupsafe==2.1.2 # xblock mccabe==0.7.0 # via pylint -mock==5.0.1 +mock==5.0.2 # via # -r requirements/test.in # -r requirements/test.txt @@ -196,12 +192,12 @@ nose==1.3.7 # via # -r requirements/test.txt # needle -openedx-django-pyfs==3.2.1 +openedx-django-pyfs==3.3.0 # via # -r requirements/base.txt # -r requirements/test.txt # xblock -packaging==23.0 +packaging==23.1 # via # -r requirements/test.txt # pytest @@ -213,7 +209,7 @@ pillow==9.5.0 # via # -r requirements/test.txt # needle -platformdirs==3.2.0 +platformdirs==3.5.1 # via # -r requirements/test.txt # pylint @@ -231,7 +227,7 @@ pycodestyle==2.10.0 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.2 +pylint==2.17.4 # via # edx-lint # pylint-celery @@ -241,7 +237,7 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django @@ -249,13 +245,13 @@ pypng==0.20220715.0 # via # -r requirements/base.txt # -r requirements/test.txt -pytest==7.3.0 +pytest==7.3.1 # via # -r requirements/test.txt # pytest-cov # pytest-django # pytest-rerunfailures -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via # -r requirements/test.in # -r requirements/test.txt @@ -293,12 +289,12 @@ pyyaml==6.0 # code-annotations # cookiecutter # xblock -requests==2.28.2 +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/test.txt # cookiecutter -s3transfer==0.6.0 +s3transfer==0.6.1 # via # -r requirements/base.txt # -r requirements/test.txt @@ -325,12 +321,12 @@ six==1.16.0 # tox snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # -r requirements/test.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via code-annotations text-unidecode==1.3 # via @@ -344,7 +340,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.7 +tomlkit==0.11.8 # via pylint tox==3.28.0 # via @@ -356,17 +352,20 @@ tox-battery==0.6.1 # via # -r requirements/test.in # -r requirements/test.txt -typing-extensions==4.5.0 +typing-extensions==4.6.3 # via + # -r requirements/base.txt + # -r requirements/test.txt + # asgiref # astroid # pylint -urllib3==1.26.15 +urllib3==1.26.16 # via # -r requirements/base.txt # -r requirements/test.txt # botocore # requests -virtualenv==20.21.0 +virtualenv==20.23.0 # via # -r requirements/test.txt # tox diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 73e79347..fd0cc1c7 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,7 +8,7 @@ build==0.10.0 # via pip-tools click==8.1.3 # via pip-tools -packaging==23.0 +packaging==23.1 # via build pip-tools==6.13.0 # via -r requirements/pip-tools.in diff --git a/requirements/pip.txt b/requirements/pip.txt index 896a85ce..5a5ce227 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.0.1 +pip==23.1.2 # via -r requirements/pip.in -setuptools==67.6.1 +setuptools==67.8.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index fb9c6455..d78e842f 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -14,11 +14,11 @@ arrow==1.2.3 # via # -r requirements/test.txt # jinja2-time -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.2 +astroid==2.15.5 # via # pylint # pylint-celery @@ -28,18 +28,16 @@ binaryornot==0.4.4 # cookiecutter bok-choy==0.7.1 # via -r requirements/test.txt -boto==2.49.0 - # via -r requirements/test.txt -boto3==1.26.109 +boto3==1.26.146 # via # -r requirements/test.txt # fs-s3fs -botocore==1.29.109 +botocore==1.29.146 # via # -r requirements/test.txt # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.5.7 # via # -r requirements/test.txt # requests @@ -64,7 +62,7 @@ code-annotations==1.3.0 # via edx-lint cookiecutter==2.1.1 # via -r requirements/test.txt -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov @@ -76,7 +74,7 @@ distlib==0.3.6 # via # -r requirements/test.txt # virtualenv -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -87,7 +85,7 @@ exceptiongroup==1.1.1 # via # -r requirements/test.txt # pytest -filelock==3.11.0 +filelock==3.12.0 # via # -r requirements/test.txt # tox @@ -145,7 +143,7 @@ mako==1.2.4 # via # -r requirements/test.txt # acid-xblock -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 @@ -153,7 +151,7 @@ markupsafe==2.1.2 # xblock mccabe==0.7.0 # via pylint -mock==5.0.1 +mock==5.0.2 # via -r requirements/test.txt needle==0.5.0 # via @@ -163,11 +161,11 @@ nose==1.3.7 # via # -r requirements/test.txt # needle -openedx-django-pyfs==3.2.1 +openedx-django-pyfs==3.3.0 # via # -r requirements/test.txt # xblock -packaging==23.0 +packaging==23.1 # via # -r requirements/test.txt # pytest @@ -179,7 +177,7 @@ pillow==9.5.0 # via # -r requirements/test.txt # needle -platformdirs==3.2.0 +platformdirs==3.5.1 # via # -r requirements/test.txt # pylint @@ -197,7 +195,7 @@ pycodestyle==2.10.0 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.2 +pylint==2.17.4 # via # edx-lint # pylint-celery @@ -207,19 +205,19 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django pypng==0.20220715.0 # via -r requirements/test.txt -pytest==7.3.0 +pytest==7.3.1 # via # -r requirements/test.txt # pytest-cov # pytest-django # pytest-rerunfailures -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.5.2 # via -r requirements/test.txt @@ -247,11 +245,11 @@ pyyaml==6.0 # code-annotations # cookiecutter # xblock -requests==2.28.2 +requests==2.31.0 # via # -r requirements/test.txt # cookiecutter -s3transfer==0.6.0 +s3transfer==0.6.1 # via # -r requirements/test.txt # boto3 @@ -273,11 +271,11 @@ six==1.16.0 # tox snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via code-annotations text-unidecode==1.3 # via @@ -290,7 +288,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.7 +tomlkit==0.11.8 # via pylint tox==3.28.0 # via @@ -299,16 +297,18 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/test.txt -typing-extensions==4.5.0 +typing-extensions==4.6.3 # via + # -r requirements/test.txt + # asgiref # astroid # pylint -urllib3==1.26.15 +urllib3==1.26.16 # via # -r requirements/test.txt # botocore # requests -virtualenv==20.21.0 +virtualenv==20.23.0 # via # -r requirements/test.txt # tox diff --git a/requirements/test.txt b/requirements/test.txt index d9f43042..35c3fa9a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,7 +14,7 @@ arrow==1.2.3 # via # -r requirements/base.txt # jinja2-time -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django @@ -24,18 +24,16 @@ binaryornot==0.4.4 # cookiecutter bok-choy==0.7.1 # via -r requirements/test.in -boto==2.49.0 - # via -r requirements/base.txt -boto3==1.26.109 +boto3==1.26.146 # via # -r requirements/base.txt # fs-s3fs -botocore==1.29.109 +botocore==1.29.146 # via # -r requirements/base.txt # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.5.7 # via # -r requirements/base.txt # requests @@ -53,7 +51,7 @@ click==8.1.3 # cookiecutter cookiecutter==2.1.1 # via -r requirements/base.txt -coverage[toml]==7.2.3 +coverage[toml]==7.2.7 # via # -r requirements/test.in # pytest-cov @@ -67,7 +65,7 @@ distlib==0.3.6 # openedx-django-pyfs exceptiongroup==1.1.1 # via pytest -filelock==3.11.0 +filelock==3.12.0 # via # tox # virtualenv @@ -113,30 +111,30 @@ lxml==4.9.2 # xblock mako==1.2.4 # via acid-xblock -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 # mako # xblock -mock==5.0.1 +mock==5.0.2 # via -r requirements/test.in needle==0.5.0 # via bok-choy nose==1.3.7 # via needle -openedx-django-pyfs==3.2.1 +openedx-django-pyfs==3.3.0 # via # -r requirements/base.txt # xblock -packaging==23.0 +packaging==23.1 # via # pytest # pytest-rerunfailures # tox pillow==9.5.0 # via needle -platformdirs==3.2.0 +platformdirs==3.5.1 # via virtualenv pluggy==1.0.0 # via @@ -146,12 +144,12 @@ py==1.11.0 # via tox pypng==0.20220715.0 # via -r requirements/base.txt -pytest==7.3.0 +pytest==7.3.1 # via # pytest-cov # pytest-django # pytest-rerunfailures -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -177,11 +175,11 @@ pyyaml==6.0 # -r requirements/base.txt # cookiecutter # xblock -requests==2.28.2 +requests==2.31.0 # via # -r requirements/base.txt # cookiecutter -s3transfer==0.6.0 +s3transfer==0.6.1 # via # -r requirements/base.txt # boto3 @@ -200,7 +198,7 @@ six==1.16.0 # fs-s3fs # python-dateutil # tox -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # django @@ -220,12 +218,16 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/test.in -urllib3==1.26.15 +typing-extensions==4.6.3 + # via + # -r requirements/base.txt + # asgiref +urllib3==1.26.16 # via # -r requirements/base.txt # botocore # requests -virtualenv==20.21.0 +virtualenv==20.23.0 # via tox web-fragments==2.0.0 # via diff --git a/workbench/__init__.py b/workbench/__init__.py index 4ab6e43d..86a59aff 100644 --- a/workbench/__init__.py +++ b/workbench/__init__.py @@ -2,4 +2,4 @@ Provide a djangoapp for XBlock development """ -__version__ = '0.5.4' +__version__ = '0.6.0'