From b4bcfd736296648ba7b259c1469bbd8ae9f6b77b Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sat, 5 Aug 2023 20:14:04 -0400 Subject: [PATCH 1/4] chore: Updating Python Requirements --- requirements/base.txt | 4 ++-- requirements/dev.txt | 40 ++++++++++++++++++++++---------------- requirements/pip-tools.txt | 4 ++-- requirements/pip.txt | 2 +- requirements/test.txt | 37 ++++++++++++++++++----------------- 5 files changed, 47 insertions(+), 40 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2d625dd..91a0c78 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -28,13 +28,13 @@ six==1.16.0 # via # fs # python-dateutil -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/base.in # xblock webob==1.8.7 # via xblock -xblock==1.6.2 +xblock==1.7.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/dev.txt b/requirements/dev.txt index 5f5d9e7..a436a59 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -31,11 +31,11 @@ bleach==6.0.0 # readme-renderer bok-choy==0.7.1 # via -r requirements/test.txt -boto3==1.28.15 +boto3==1.28.20 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.15 +botocore==1.31.20 # via # -r requirements/test.txt # boto3 @@ -48,7 +48,7 @@ certifi==2023.7.22 # via # -r requirements/test.txt # requests -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/test.txt # binaryornot @@ -73,7 +73,7 @@ code-annotations==1.5.0 # via # -r requirements/test.txt # edx-lint -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via # -r requirements/test.txt # xblock-sdk @@ -90,7 +90,6 @@ distlib==0.3.7 django==3.2.20 # via # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk docutils==0.20.1 # via @@ -111,12 +110,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 @@ -144,7 +141,6 @@ lazy==1.5 # via # -r requirements/test.txt # bok-choy - # xblock lazy-object-proxy==1.9.0 # via # -r requirements/test.txt @@ -156,6 +152,10 @@ lxml==4.9.3 # xblock-sdk mako==1.2.4 # via -r requirements/test.txt +markdown-it-py==3.0.0 + # via + # -r requirements/test.txt + # rich markupsafe==2.1.3 # via # -r requirements/test.txt @@ -166,6 +166,10 @@ mccabe==0.7.0 # via # -r requirements/test.txt # pylint +mdurl==0.1.2 + # via + # -r requirements/test.txt + # markdown-it-py mock==5.1.0 # via -r requirements/test.txt needle==0.5.0 @@ -176,10 +180,6 @@ nose==1.3.7 # via # -r requirements/test.txt # needle -openedx-django-pyfs==3.4.0 - # via - # -r requirements/test.txt - # xblock packaging==23.1 # via # -r requirements/ci.txt @@ -196,7 +196,7 @@ pillow==10.0.0 # via # -r requirements/test.txt # needle -pip-tools==7.1.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.txt platformdirs==3.10.0 # via @@ -220,6 +220,7 @@ pygments==2.15.1 # via # -r requirements/test.txt # readme-renderer + # rich pylint==2.17.5 # via # -r requirements/test.txt @@ -283,6 +284,10 @@ requests==2.31.0 # -r requirements/test.txt # cookiecutter # xblock-sdk +rich==13.5.2 + # via + # -r requirements/test.txt + # cookiecutter s3transfer==0.6.1 # via # -r requirements/test.txt @@ -346,6 +351,7 @@ typing-extensions==4.7.1 # asgiref # astroid # pylint + # rich urllib3==1.26.16 # via # -r requirements/test.txt @@ -355,7 +361,7 @@ virtualenv==20.24.2 # via # -r requirements/ci.txt # tox -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/test.txt # xblock @@ -369,7 +375,7 @@ webob==1.8.7 # -r requirements/test.txt # xblock # xblock-sdk -wheel==0.41.0 +wheel==0.41.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -377,11 +383,11 @@ wrapt==1.15.0 # via # -r requirements/test.txt # astroid -xblock[django]==1.6.2 +xblock==1.7.0 # via # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 5748bf6..ed274ee 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.6 # via pip-tools packaging==23.1 # via build -pip-tools==7.1.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build @@ -19,7 +19,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.0 +wheel==0.41.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index fb1908e..5e2f760 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,7 +4,7 @@ # # make upgrade # -wheel==0.41.0 +wheel==0.41.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index f9d6569..a052de1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -24,15 +24,15 @@ bok-choy==0.7.1 # via # -c requirements/constraints.txt # -r requirements/test.in -boto3==1.28.15 +boto3==1.28.20 # via fs-s3fs -botocore==1.31.15 +botocore==1.31.20 # via # boto3 # s3transfer certifi==2023.7.22 # via requests -chardet==5.1.0 +chardet==5.2.0 # via binaryornot charset-normalizer==3.2.0 # via requests @@ -46,7 +46,7 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via xblock-sdk ddt==1.6.0 # via -r requirements/test.in @@ -54,7 +54,6 @@ dill==0.3.7 # via pylint # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # openedx-django-pyfs # xblock-sdk docutils==0.20.1 # via readme-renderer @@ -66,12 +65,9 @@ fs==2.4.16 # via # -r requirements/base.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via - # openedx-django-pyfs - # xblock-sdk + # via xblock-sdk idna==3.4 # via requests iniconfig==2.0.0 @@ -87,9 +83,7 @@ jmespath==1.0.1 # boto3 # botocore lazy==1.5 - # via - # bok-choy - # xblock + # via bok-choy lazy-object-proxy==1.9.0 # via astroid lxml==4.9.3 @@ -99,6 +93,8 @@ lxml==4.9.3 # xblock-sdk mako==1.2.4 # via -r requirements/base.txt +markdown-it-py==3.0.0 + # via rich markupsafe==2.1.3 # via # -r requirements/base.txt @@ -107,14 +103,14 @@ markupsafe==2.1.3 # xblock mccabe==0.7.0 # via pylint +mdurl==0.1.2 + # via markdown-it-py mock==5.1.0 # via -r requirements/test.in needle==0.5.0 # via bok-choy nose==1.3.7 # via needle -openedx-django-pyfs==3.4.0 - # via xblock packaging==23.1 # via pytest pbr==5.11.1 @@ -128,7 +124,9 @@ pluggy==1.2.0 pycodestyle==2.11.0 # via -r requirements/test.in pygments==2.15.1 - # via readme-renderer + # via + # readme-renderer + # rich pylint==2.17.5 # via # edx-lint @@ -178,6 +176,8 @@ requests==2.31.0 # via # cookiecutter # xblock-sdk +rich==13.5.2 + # via cookiecutter s3transfer==0.6.1 # via boto3 selenium==3.4.1 @@ -216,11 +216,12 @@ typing-extensions==4.7.1 # asgiref # astroid # pylint + # rich urllib3==1.26.16 # via # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/base.txt # xblock @@ -234,11 +235,11 @@ webob==1.8.7 # xblock-sdk wrapt==1.15.0 # via astroid -xblock[django]==1.6.2 +xblock==1.7.0 # via # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.in # The following packages are considered to be unsafe in a requirements file: From 659d07289390607e07502ac88612c4654e4931b8 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 7 Aug 2023 10:07:01 -0400 Subject: [PATCH 2/4] build: Make the django dependency explicit. We need to explicitly require the `django` extra to pull in the django-pyfs dependency which is required to run this correctly. --- requirements/base.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.in b/requirements/base.in index 31d4c33..627437c 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -5,4 +5,4 @@ mako # Used by xblockutils.resources simplejson web-fragments -Xblock +Xblock[django] From ba298016f3a5e1795ad59a1e6398df1148ec7190 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 7 Aug 2023 10:12:18 -0400 Subject: [PATCH 3/4] chore: Run `make upgrade` --- requirements/base.txt | 44 ++++++++++++++++++++++++++++++++++++++++--- requirements/dev.txt | 12 ++++++++++-- requirements/docs.txt | 2 +- requirements/test.txt | 41 ++++++++++++++++++++++++++++++++-------- 4 files changed, 85 insertions(+), 14 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 91a0c78..b434a36 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,30 @@ # appdirs==1.4.4 # via fs +asgiref==3.7.2 + # via django +boto3==1.28.20 + # via fs-s3fs +botocore==1.31.20 + # via + # boto3 + # s3transfer +django==3.2.20 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # 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.5 # via xblock lxml==4.9.3 # via xblock @@ -16,25 +39,40 @@ markupsafe==2.1.3 # via # mako # xblock -python-dateutil==2.8.2 +openedx-django-pyfs==3.4.0 # via xblock +python-dateutil==2.8.2 + # via + # botocore + # xblock pytz==2023.3 - # via xblock + # via + # django + # xblock pyyaml==6.0.1 # via xblock +s3transfer==0.6.1 + # via boto3 simplejson==3.19.1 # via -r requirements/base.in six==1.16.0 # via # fs + # fs-s3fs # python-dateutil +sqlparse==0.4.4 + # via django +typing-extensions==4.7.1 + # via asgiref +urllib3==1.26.16 + # via botocore web-fragments==2.1.0 # via # -r requirements/base.in # xblock webob==1.8.7 # via xblock -xblock==1.7.0 +xblock[django]==1.7.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/dev.txt b/requirements/dev.txt index a436a59..35f1606 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -90,6 +90,7 @@ distlib==0.3.7 django==3.2.20 # via # -r requirements/test.txt + # openedx-django-pyfs # xblock-sdk docutils==0.20.1 # via @@ -110,10 +111,12 @@ 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 @@ -141,6 +144,7 @@ lazy==1.5 # via # -r requirements/test.txt # bok-choy + # xblock lazy-object-proxy==1.9.0 # via # -r requirements/test.txt @@ -180,6 +184,10 @@ nose==1.3.7 # via # -r requirements/test.txt # needle +openedx-django-pyfs==3.4.0 + # via + # -r requirements/test.txt + # xblock packaging==23.1 # via # -r requirements/ci.txt @@ -216,7 +224,7 @@ py==1.11.0 # tox pycodestyle==2.11.0 # via -r requirements/test.txt -pygments==2.15.1 +pygments==2.16.1 # via # -r requirements/test.txt # readme-renderer @@ -383,7 +391,7 @@ wrapt==1.15.0 # via # -r requirements/test.txt # astroid -xblock==1.7.0 +xblock[django]==1.7.0 # via # -r requirements/test.txt # xblock-sdk diff --git a/requirements/docs.txt b/requirements/docs.txt index f3393d0..ede1b77 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -42,7 +42,7 @@ packaging==23.1 # sphinx pydata-sphinx-theme==0.13.3 # via sphinx-book-theme -pygments==2.15.1 +pygments==2.16.1 # via # accessible-pygments # pydata-sphinx-theme diff --git a/requirements/test.txt b/requirements/test.txt index a052de1..933ba87 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -11,7 +11,9 @@ appdirs==1.4.4 arrow==1.2.3 # via cookiecutter asgiref==3.7.2 - # via django + # via + # -r requirements/base.txt + # django astroid==2.15.6 # via # pylint @@ -25,9 +27,12 @@ bok-choy==0.7.1 # -c requirements/constraints.txt # -r requirements/test.in boto3==1.28.20 - # via fs-s3fs + # via + # -r requirements/base.txt + # fs-s3fs botocore==1.31.20 # via + # -r requirements/base.txt # boto3 # s3transfer certifi==2023.7.22 @@ -54,6 +59,8 @@ dill==0.3.7 # via pylint # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/base.txt + # openedx-django-pyfs # xblock-sdk docutils==0.20.1 # via readme-renderer @@ -65,9 +72,13 @@ fs==2.4.16 # via # -r requirements/base.txt # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via xblock-sdk + # via + # -r requirements/base.txt + # openedx-django-pyfs + # xblock-sdk idna==3.4 # via requests iniconfig==2.0.0 @@ -80,10 +91,14 @@ jinja2==3.1.2 # cookiecutter jmespath==1.0.1 # via + # -r requirements/base.txt # boto3 # botocore lazy==1.5 - # via bok-choy + # via + # -r requirements/base.txt + # bok-choy + # xblock lazy-object-proxy==1.9.0 # via astroid lxml==4.9.3 @@ -111,6 +126,10 @@ needle==0.5.0 # via bok-choy nose==1.3.7 # via needle +openedx-django-pyfs==3.4.0 + # via + # -r requirements/base.txt + # xblock packaging==23.1 # via pytest pbr==5.11.1 @@ -123,7 +142,7 @@ pluggy==1.2.0 # via pytest pycodestyle==2.11.0 # via -r requirements/test.in -pygments==2.15.1 +pygments==2.16.1 # via # readme-renderer # rich @@ -179,7 +198,9 @@ requests==2.31.0 rich==13.5.2 # via cookiecutter s3transfer==0.6.1 - # via boto3 + # via + # -r requirements/base.txt + # boto3 selenium==3.4.1 # via # -c requirements/constraints.txt @@ -200,7 +221,9 @@ six==1.16.0 # fs-s3fs # python-dateutil sqlparse==0.4.4 - # via django + # via + # -r requirements/base.txt + # django stevedore==5.1.0 # via code-annotations text-unidecode==1.3 @@ -213,12 +236,14 @@ tomlkit==0.12.1 # via pylint typing-extensions==4.7.1 # via + # -r requirements/base.txt # asgiref # astroid # pylint # rich urllib3==1.26.16 # via + # -r requirements/base.txt # botocore # requests web-fragments==2.1.0 @@ -235,7 +260,7 @@ webob==1.8.7 # xblock-sdk wrapt==1.15.0 # via astroid -xblock==1.7.0 +xblock[django]==1.7.0 # via # -r requirements/base.txt # xblock-sdk From fd95a303cf654321984ca8758e6b9e53b2f5418c Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 7 Aug 2023 10:15:07 -0400 Subject: [PATCH 4/4] build: Bumping the version in preparation for release. We want to make the django dependency explicit to make sure we don't break upstream packages that depend on this one. --- xblockutils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xblockutils/__init__.py b/xblockutils/__init__.py index 0ebf674..41e1c9e 100644 --- a/xblockutils/__init__.py +++ b/xblockutils/__init__.py @@ -2,4 +2,4 @@ Useful classes and functionality for building and testing XBlocks """ -__version__ = '3.3.0' +__version__ = '3.4.0'