From e3874a36ec532aa60bef9385d0e705d887d0086d Mon Sep 17 00:00:00 2001 From: OpenCraft Requirements Bot Date: Tue, 8 Aug 2023 11:11:21 +0200 Subject: [PATCH 1/3] chore: Updating Python Requirements --- requirements/base.txt | 8 ++--- requirements/ci.txt | 6 ++-- requirements/dev.txt | 72 +++++++++++++++++++++----------------- requirements/pip-tools.txt | 6 ++-- requirements/pip.txt | 4 +-- requirements/quality.txt | 64 ++++++++++++++++++--------------- requirements/test.txt | 45 ++++++++++++------------ 7 files changed, 109 insertions(+), 96 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b1c2c12..fe5354c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -30,7 +30,7 @@ pytz==2023.3 # via # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via xblock simplejson==3.19.1 # via xblock-utils @@ -45,7 +45,7 @@ tinycss2==1.1.1 # via bleach typing-extensions==4.7.1 # via asgiref -web-fragments==2.0.0 +web-fragments==2.1.0 # via # xblock # xblock-utils @@ -55,9 +55,9 @@ webencodings==0.5.1 # tinycss2 webob==1.8.7 # via xblock -xblock==1.6.2 +xblock==1.7.0 # via xblock-utils -xblock-utils==3.2.0 +xblock-utils==3.4.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 fee68c1..b43d9e2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via virtualenv filelock==3.12.2 # via @@ -12,7 +12,7 @@ filelock==3.12.2 # virtualenv packaging==23.1 # via tox -platformdirs==3.9.1 +platformdirs==3.10.0 # via virtualenv pluggy==1.2.0 # via tox @@ -29,5 +29,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -virtualenv==20.24.0 +virtualenv==20.24.2 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 659d6b7..ffb002f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -27,11 +27,11 @@ binaryornot==0.4.4 # cookiecutter bleach[css]==6.0.0 # via -r requirements/quality.txt -boto3==1.28.3 +boto3==1.28.21 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.31.3 +botocore==1.31.21 # via # -r requirements/quality.txt # boto3 @@ -40,11 +40,11 @@ build==0.10.0 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/quality.txt # requests -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/quality.txt # binaryornot @@ -52,7 +52,7 @@ charset-normalizer==3.2.0 # via # -r requirements/quality.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -65,11 +65,11 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-lint -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via # -r requirements/quality.txt # xblock-sdk @@ -77,11 +77,11 @@ coverage[toml]==7.2.7 # via # -r requirements/quality.txt # pytest-cov -dill==0.3.6 +dill==0.3.7 # via # -r requirements/quality.txt # pylint -distlib==0.3.6 +distlib==0.3.7 # via # -r requirements/ci.txt # virtualenv @@ -90,9 +90,8 @@ django==3.2.20 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/quality.txt edx-lint==5.3.4 # via -r requirements/quality.txt @@ -109,12 +108,10 @@ fs==2.4.16 # via # -r requirements/quality.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt - # openedx-django-pyfs # xblock-sdk idna==3.4 # via @@ -138,10 +135,6 @@ jmespath==1.0.1 # -r requirements/quality.txt # boto3 # botocore -lazy==1.5 - # via - # -r requirements/quality.txt - # xblock lazy-object-proxy==1.9.0 # via # -r requirements/quality.txt @@ -155,6 +148,10 @@ mako==1.2.4 # via # -r requirements/quality.txt # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/quality.txt + # rich markupsafe==2.1.3 # via # -r requirements/quality.txt @@ -165,12 +162,12 @@ mccabe==0.7.0 # via # -r requirements/quality.txt # pylint -mock==5.1.0 - # via -r requirements/quality.txt -openedx-django-pyfs==3.4.0 +mdurl==0.1.2 # via # -r requirements/quality.txt - # xblock + # markdown-it-py +mock==5.1.0 + # via -r requirements/quality.txt packaging==23.1 # via # -r requirements/ci.txt @@ -187,9 +184,9 @@ pbr==5.11.1 # via # -r requirements/quality.txt # stevedore -pip-tools==7.0.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.txt -platformdirs==3.9.1 +platformdirs==3.10.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -209,11 +206,15 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.txt pydocstyle==6.3.0 # via -r requirements/quality.txt -pylint==2.17.4 +pygments==2.16.1 + # via + # -r requirements/quality.txt + # rich +pylint==2.17.5 # via # -r requirements/quality.txt # edx-lint @@ -266,7 +267,7 @@ pytz==2023.3 # -r requirements/quality.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/quality.txt # code-annotations @@ -278,6 +279,10 @@ requests==2.31.0 # -r requirements/quality.txt # cookiecutter # xblock-sdk +rich==13.5.2 + # via + # -r requirements/quality.txt + # cookiecutter s3transfer==0.6.1 # via # -r requirements/quality.txt @@ -329,7 +334,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/quality.txt # pylint @@ -346,16 +351,17 @@ typing-extensions==4.7.1 # asgiref # astroid # pylint + # rich urllib3==1.26.16 # via # -r requirements/quality.txt # botocore # requests -virtualenv==20.24.0 +virtualenv==20.24.2 # via # -r requirements/ci.txt # tox -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/quality.txt # xblock @@ -371,7 +377,7 @@ webob==1.8.7 # -r requirements/quality.txt # xblock # xblock-sdk -wheel==0.40.0 +wheel==0.41.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -379,14 +385,14 @@ wrapt==1.15.0 # via # -r requirements/quality.txt # astroid -xblock[django]==1.6.2 +xblock==1.7.0 # via # -r requirements/quality.txt # xblock-sdk # xblock-utils -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/quality.txt -xblock-utils==3.2.0 +xblock-utils==3.4.0 # via -r requirements/quality.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 81f46a7..ed274ee 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,11 +6,11 @@ # build==0.10.0 # via pip-tools -click==8.1.5 +click==8.1.6 # via pip-tools packaging==23.1 # via build -pip-tools==7.0.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.40.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 bd9fb55..5e2f760 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2 +pip==23.2.1 # via -r requirements/pip.in setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index ddb7fab..b0ad4aa 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -26,20 +26,20 @@ binaryornot==0.4.4 # cookiecutter bleach[css]==6.0.0 # via -r requirements/test.txt -boto3==1.28.3 +boto3==1.28.21 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.3 +botocore==1.31.21 # via # -r requirements/test.txt # boto3 # s3transfer -certifi==2023.5.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 @@ -47,7 +47,7 @@ charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/test.txt # click-log @@ -56,11 +56,11 @@ click==8.1.5 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +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 @@ -68,16 +68,15 @@ coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -dill==0.3.6 +dill==0.3.7 # via pylint django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/quality.in @@ -89,12 +88,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 @@ -118,10 +115,6 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -lazy==1.5 - # via - # -r requirements/test.txt - # xblock lazy-object-proxy==1.9.0 # via astroid lxml==4.9.3 @@ -133,6 +126,10 @@ mako==1.2.4 # via # -r requirements/test.txt # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/test.txt + # rich markupsafe==2.1.3 # via # -r requirements/test.txt @@ -141,12 +138,12 @@ markupsafe==2.1.3 # xblock mccabe==0.7.0 # via pylint -mock==5.1.0 - # via -r requirements/test.txt -openedx-django-pyfs==3.4.0 +mdurl==0.1.2 # via # -r requirements/test.txt - # xblock + # markdown-it-py +mock==5.1.0 + # via -r requirements/test.txt packaging==23.1 # via # -r requirements/test.txt @@ -159,7 +156,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via pylint pluggy==1.2.0 # via @@ -169,11 +166,15 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.4 +pygments==2.16.1 + # via + # -r requirements/test.txt + # rich +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -216,7 +217,7 @@ pytz==2023.3 # -r requirements/test.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations @@ -228,6 +229,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 @@ -269,7 +274,7 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint typing-extensions==4.7.1 # via @@ -277,12 +282,13 @@ typing-extensions==4.7.1 # asgiref # astroid # pylint + # rich urllib3==1.26.16 # via # -r requirements/test.txt # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/test.txt # xblock @@ -300,14 +306,14 @@ webob==1.8.7 # xblock-sdk wrapt==1.15.0 # via astroid -xblock[django]==1.6.2 +xblock==1.7.0 # via # -r requirements/test.txt # xblock-sdk # xblock-utils -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.txt -xblock-utils==3.2.0 +xblock-utils==3.4.0 # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index b28dd8e..e87740d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,25 +17,25 @@ asgiref==3.7.2 binaryornot==0.4.4 # via cookiecutter # via -r requirements/base.txt -boto3==1.28.3 +boto3==1.28.21 # via fs-s3fs -botocore==1.31.3 +botocore==1.31.21 # via # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.7.22 # via requests -chardet==5.1.0 +chardet==5.2.0 # via binaryornot charset-normalizer==3.2.0 # via requests -click==8.1.5 +click==8.1.6 # via # code-annotations # cookiecutter -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.in -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via xblock-sdk coverage[toml]==7.2.7 # via pytest-cov @@ -43,9 +43,8 @@ coverage[toml]==7.2.7 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/test.in exceptiongroup==1.1.2 # via pytest @@ -53,12 +52,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 @@ -71,8 +67,6 @@ jmespath==1.0.1 # via # boto3 # botocore -lazy==1.5 - # via xblock lxml==4.9.3 # via # -r requirements/base.txt @@ -82,16 +76,18 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock-utils +markdown-it-py==3.0.0 + # via rich markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 # mako # xblock +mdurl==0.1.2 + # via markdown-it-py mock==5.1.0 # via -r requirements/test.in -openedx-django-pyfs==3.4.0 - # via xblock packaging==23.1 # via pytest path==16.7.1 @@ -102,6 +98,8 @@ pluggy==1.2.0 # via pytest polib==1.2.0 # via edx-i18n-tools +pygments==2.16.1 + # via rich pypng==0.20220715.0 # via xblock-sdk pytest==7.4.0 @@ -127,7 +125,7 @@ pytz==2023.3 # -r requirements/base.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/base.txt # code-annotations @@ -138,6 +136,8 @@ requests==2.31.0 # via # cookiecutter # xblock-sdk +rich==13.5.2 + # via cookiecutter s3transfer==0.6.1 # via boto3 simplejson==3.19.1 @@ -172,11 +172,12 @@ typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref + # rich urllib3==1.26.16 # via # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/base.txt # xblock @@ -192,14 +193,14 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock[django]==1.6.2 +xblock==1.7.0 # via # -r requirements/base.txt # xblock-sdk # xblock-utils -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.in -xblock-utils==3.2.0 +xblock-utils==3.4.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: From 9ea3c3ea9a931407fc08a243ded676091a8983e4 Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Tue, 8 Aug 2023 11:33:16 +0200 Subject: [PATCH 2/3] chore: add back `openedx-django-pyfs` --- requirements/base.in | 1 + requirements/base.txt | 35 ++++++++++++++++++++++++++++++++--- requirements/dev.txt | 13 ++++++++++++- requirements/quality.txt | 13 ++++++++++++- requirements/test.txt | 28 ++++++++++++++++++++++++---- 5 files changed, 81 insertions(+), 9 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index f1e30f2..537a84b 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -2,5 +2,6 @@ -c constraints.txt xblock-utils +xblock[django] # xblock-utils is not installing openedx-django-pyfs bleach[css] Django diff --git a/requirements/base.txt b/requirements/base.txt index fe5354c..86826ba 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,11 +10,29 @@ asgiref==3.7.2 # via django bleach[css]==6.0.0 # via -r requirements/base.in +boto3==1.28.21 + # via fs-s3fs +botocore==1.31.21 + # via + # boto3 + # s3transfer django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/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.5 # via xblock lxml==4.9.3 # via xblock @@ -24,20 +42,27 @@ 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 # django # xblock pyyaml==6.0.1 # via xblock +s3transfer==0.6.1 + # via boto3 simplejson==3.19.1 # via xblock-utils six==1.16.0 # via # bleach # fs + # fs-s3fs # python-dateutil sqlparse==0.4.4 # via django @@ -45,6 +70,8 @@ tinycss2==1.1.1 # via bleach typing-extensions==4.7.1 # via asgiref +urllib3==1.26.16 + # via botocore web-fragments==2.1.0 # via # xblock @@ -55,8 +82,10 @@ webencodings==0.5.1 # tinycss2 webob==1.8.7 # via xblock -xblock==1.7.0 - # via xblock-utils +xblock[django]==1.7.0 + # via + # -r requirements/base.in + # xblock-utils xblock-utils==3.4.0 # via -r requirements/base.in diff --git a/requirements/dev.txt b/requirements/dev.txt index ffb002f..657acfc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -90,6 +90,7 @@ django==3.2.20 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk edx-i18n-tools==1.1.0 # via -r requirements/quality.txt @@ -108,10 +109,12 @@ fs==2.4.16 # via # -r requirements/quality.txt # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt + # openedx-django-pyfs # xblock-sdk idna==3.4 # via @@ -135,6 +138,10 @@ jmespath==1.0.1 # -r requirements/quality.txt # boto3 # botocore +lazy==1.5 + # via + # -r requirements/quality.txt + # xblock lazy-object-proxy==1.9.0 # via # -r requirements/quality.txt @@ -168,6 +175,10 @@ mdurl==0.1.2 # markdown-it-py mock==5.1.0 # via -r requirements/quality.txt +openedx-django-pyfs==3.4.0 + # via + # -r requirements/quality.txt + # xblock packaging==23.1 # via # -r requirements/ci.txt @@ -385,7 +396,7 @@ wrapt==1.15.0 # via # -r requirements/quality.txt # astroid -xblock==1.7.0 +xblock[django]==1.7.0 # via # -r requirements/quality.txt # xblock-sdk diff --git a/requirements/quality.txt b/requirements/quality.txt index b0ad4aa..ffde6a9 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -75,6 +75,7 @@ django==3.2.20 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk edx-i18n-tools==1.1.0 # via -r requirements/test.txt @@ -88,10 +89,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 @@ -115,6 +118,10 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore +lazy==1.5 + # via + # -r requirements/test.txt + # xblock lazy-object-proxy==1.9.0 # via astroid lxml==4.9.3 @@ -144,6 +151,10 @@ mdurl==0.1.2 # markdown-it-py mock==5.1.0 # via -r requirements/test.txt +openedx-django-pyfs==3.4.0 + # via + # -r requirements/test.txt + # xblock packaging==23.1 # via # -r requirements/test.txt @@ -306,7 +317,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/test.txt # xblock-sdk diff --git a/requirements/test.txt b/requirements/test.txt index e87740d..fb9a00a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -18,9 +18,12 @@ binaryornot==0.4.4 # via cookiecutter # via -r requirements/base.txt boto3==1.28.21 - # via fs-s3fs + # via + # -r requirements/base.txt + # fs-s3fs botocore==1.31.21 # via + # -r requirements/base.txt # boto3 # s3transfer certifi==2023.7.22 @@ -43,6 +46,7 @@ coverage[toml]==7.2.7 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk edx-i18n-tools==1.1.0 # via -r requirements/test.in @@ -52,9 +56,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 @@ -65,8 +73,13 @@ jinja2==3.1.2 # cookiecutter jmespath==1.0.1 # via + # -r requirements/base.txt # boto3 # botocore +lazy==1.5 + # via + # -r requirements/base.txt + # xblock lxml==4.9.3 # via # -r requirements/base.txt @@ -88,6 +101,10 @@ mdurl==0.1.2 # via markdown-it-py mock==5.1.0 # via -r requirements/test.in +openedx-django-pyfs==3.4.0 + # via + # -r requirements/base.txt + # xblock packaging==23.1 # via pytest path==16.7.1 @@ -139,7 +156,9 @@ requests==2.31.0 rich==13.5.2 # via cookiecutter s3transfer==0.6.1 - # via boto3 + # via + # -r requirements/base.txt + # boto3 simplejson==3.19.1 # via # -r requirements/base.txt @@ -175,6 +194,7 @@ typing-extensions==4.7.1 # rich urllib3==1.26.16 # via + # -r requirements/base.txt # botocore # requests web-fragments==2.1.0 @@ -193,7 +213,7 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock==1.7.0 +xblock[django]==1.7.0 # via # -r requirements/base.txt # xblock-sdk From c62c69df8521d2eae26b1338462e03f8231c3fd4 Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Tue, 8 Aug 2023 11:34:41 +0200 Subject: [PATCH 3/3] test: use Django 4.2 instead of 4.1 --- .github/workflows/ci.yml | 2 +- .gitignore | 1 + tox.ini | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 534fbd3..648bab1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: [3.8] - toxenv: [django32-nutmeg, django32-latest, django41-latest, quality, pii_check] + toxenv: [django32-nutmeg, django32-latest, django42-latest, quality, pii_check] steps: - name: checkout repo diff --git a/.gitignore b/.gitignore index f139045..ef8a3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ pip-log.txt coverage.xml htmlcov/ diff-cover.html +pii_report # Translations *.mo diff --git a/tox.ini b/tox.ini index 547c273..228cd3a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = django{32,41}-{nutmeg,latest} +envlist = django{32,41}-{nutmeg,latest},quality,pii_check [pycodestyle] exclude = .git,.tox,migrations @@ -37,7 +37,7 @@ allowlist_externals = mkdir deps = django32: Django>=3.2,<4.0 - django41: Django>=4.1,<4.2 + django42: Django>=4.2,<5.0 nutmeg: bleach[css]==5.0.0 latest: bleach[css] -r{toxinidir}/requirements/test.txt