From d2537e8202fd5648cffc0ba96fd4f153a6d06146 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 3 Aug 2023 16:00:05 +0500 Subject: [PATCH] chore: fixing make upgrade --- requirements/base.txt | 3 +- requirements/constraints.txt | 7 ----- requirements/quality.txt | 51 ++++++++++++++++++++++++++++---- requirements/test-acceptance.txt | 51 ++++++++++++++++++++++++++++---- requirements/test.txt | 40 +++++++++++++++++++++---- 5 files changed, 127 insertions(+), 25 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 677e9cbd63..d01d36c7ef 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -131,9 +131,8 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -python-dateutil==2.4.0 +python-dateutil==2.8.2 # via - # -c requirements/constraints.txt # -r requirements/base.in # botocore # xblock diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 97e70d6c2b..6de69e3b8f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,13 +10,6 @@ Django<4.0 # Stay on the latest LTS release of Django fs<=2.0.18 # Constrained by edx-platform loremipsum<2.0.0 -# Upgrading to 2.5.3 triggered "'tzlocal' object -# has no attribute '_std_offset'" errors in production in edx-platform repo. -python-dateutil==2.4.0 - -# We currently pin dateutil above because edx-platform pins dateutil. -# xblock-sdk 0.5.1 requires dateutil>2.4.0 -xblock-sdk==0.4.0 python-swiftclient<4.0.0 voluptuous<1.0.0 diff --git a/requirements/quality.txt b/requirements/quality.txt index 9382be85fb..cacfd6c737 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,6 +8,10 @@ appdirs==1.4.4 # via # -r requirements/test.txt # fs +arrow==1.2.3 + # via + # -r requirements/test.txt + # cookiecutter asgiref==3.7.2 # via # -r requirements/test.txt @@ -30,6 +34,10 @@ aws-xray-sdk==2.12.0 # via # -r requirements/test.txt # moto +binaryornot==0.4.4 + # via + # -r requirements/test.txt + # cookiecutter bleach==6.0.0 # via -r requirements/test.txt boto==2.49.0 @@ -40,6 +48,7 @@ boto3==1.28.18 # via # -r requirements/test.txt # aws-sam-translator + # fs-s3fs # moto botocore==1.31.18 # via @@ -61,6 +70,10 @@ cfn-lint==0.79.6 # via # -r requirements/test.txt # moto +chardet==5.2.0 + # via + # -r requirements/test.txt + # binaryornot charset-normalizer==3.2.0 # via # -r requirements/test.txt @@ -70,6 +83,7 @@ click==8.1.6 # -r requirements/test.txt # click-log # code-annotations + # cookiecutter # edx-django-utils # edx-lint click-log==0.4.0 @@ -79,6 +93,10 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles +cookiecutter==2.2.3 + # via + # -r requirements/test.txt + # xblock-sdk coverage[toml]==7.2.7 # via # -r requirements/test.txt @@ -187,7 +205,13 @@ fs==2.0.18 # via # -c requirements/constraints.txt # -r requirements/test.txt + # fs-s3fs # xblock +fs-s3fs==0.1.8 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # xblock-sdk html5lib==1.1 # via -r requirements/test.txt idna==2.8 @@ -210,6 +234,7 @@ jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations + # cookiecutter # moto jmespath==1.0.1 # via @@ -261,6 +286,7 @@ lxml==4.9.3 # via # -r requirements/test.txt # xblock + # xblock-sdk markupsafe==2.1.3 # via # -r requirements/test.txt @@ -375,6 +401,10 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils +pypng==0.20220715.0 + # via + # -r requirements/test.txt + # xblock-sdk pyrsistent==0.19.3 # via # -r requirements/test.txt @@ -388,10 +418,10 @@ pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.5.2 # via -r requirements/test.txt -python-dateutil==2.4.0 +python-dateutil==2.8.2 # via - # -c requirements/constraints.txt # -r requirements/test.txt + # arrow # botocore # faker # freezegun @@ -405,6 +435,7 @@ python-slugify==8.0.1 # via # -r requirements/test.txt # code-annotations + # cookiecutter python-swiftclient==3.13.1 # via # -c requirements/constraints.txt @@ -423,6 +454,7 @@ pyyaml==6.0.1 # -r requirements/test.txt # cfn-lint # code-annotations + # cookiecutter # edx-i18n-tools # moto # responses @@ -434,10 +466,12 @@ regex==2023.6.3 requests==2.31.0 # via # -r requirements/test.txt + # cookiecutter # docker # moto # python-swiftclient # responses + # xblock-sdk responses==0.23.3 # via # -r requirements/test.txt @@ -454,6 +488,10 @@ sarif-om==1.0.4 # via # -r requirements/test.txt # cfn-lint +simplejson==3.19.1 + # via + # -r requirements/test.txt + # xblock-sdk six==1.16.0 # via # -r requirements/test.txt @@ -462,6 +500,7 @@ six==1.16.0 # edx-lint # freezegun # fs + # fs-s3fs # html5lib # junit-xml # moto @@ -537,6 +576,7 @@ web-fragments==2.0.0 # via # -r requirements/test.txt # xblock + # xblock-sdk webencodings==0.5.1 # via # -r requirements/test.txt @@ -546,6 +586,7 @@ webob==1.8.7 # via # -r requirements/test.txt # xblock + # xblock-sdk websocket-client==1.6.1 # via # -r requirements/test.txt @@ -561,11 +602,11 @@ wrapt==1.11.2 # astroid # aws-xray-sdk xblock==1.6.2 - # via -r requirements/test.txt -xblock-sdk==0.4.0 # via - # -c requirements/constraints.txt # -r requirements/test.txt + # xblock-sdk +xblock-sdk==0.7.0 + # via -r requirements/test.txt xmltodict==0.13.0 # via # -r requirements/test.txt diff --git a/requirements/test-acceptance.txt b/requirements/test-acceptance.txt index 733e8cb894..fcd07ab3ef 100644 --- a/requirements/test-acceptance.txt +++ b/requirements/test-acceptance.txt @@ -8,6 +8,10 @@ appdirs==1.4.4 # via # -r requirements/test.txt # fs +arrow==1.2.3 + # via + # -r requirements/test.txt + # cookiecutter asgiref==3.7.2 # via # -r requirements/test.txt @@ -26,6 +30,10 @@ aws-xray-sdk==2.12.0 # via # -r requirements/test.txt # moto +binaryornot==0.4.4 + # via + # -r requirements/test.txt + # cookiecutter bleach==6.0.0 # via -r requirements/test.txt bok-choy==2.0.2 @@ -38,6 +46,7 @@ boto3==1.28.18 # via # -r requirements/test.txt # aws-sam-translator + # fs-s3fs # moto botocore==1.31.18 # via @@ -59,6 +68,10 @@ cfn-lint==0.79.6 # via # -r requirements/test.txt # moto +chardet==5.2.0 + # via + # -r requirements/test.txt + # binaryornot charset-normalizer==3.2.0 # via # -r requirements/test.txt @@ -67,11 +80,16 @@ click==8.1.6 # via # -r requirements/test.txt # code-annotations + # cookiecutter # edx-django-utils code-annotations==1.5.0 # via # -r requirements/test.txt # edx-toggles +cookiecutter==2.2.3 + # via + # -r requirements/test.txt + # xblock-sdk coverage[toml]==7.2.7 # via # -r requirements/test.txt @@ -177,7 +195,13 @@ fs==2.0.18 # via # -c requirements/constraints.txt # -r requirements/test.txt + # fs-s3fs # xblock +fs-s3fs==0.1.8 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # xblock-sdk html5lib==1.1 # via -r requirements/test.txt idna==2.8 @@ -198,6 +222,7 @@ jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations + # cookiecutter # moto jmespath==1.0.1 # via @@ -249,6 +274,7 @@ lxml==4.9.3 # via # -r requirements/test.txt # xblock + # xblock-sdk markupsafe==2.1.3 # via # -r requirements/test.txt @@ -346,6 +372,10 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils +pypng==0.20220715.0 + # via + # -r requirements/test.txt + # xblock-sdk pyrsistent==0.19.3 # via # -r requirements/test.txt @@ -360,10 +390,10 @@ pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.5.2 # via -r requirements/test.txt -python-dateutil==2.4.0 +python-dateutil==2.8.2 # via - # -c requirements/constraints.txt # -r requirements/test.txt + # arrow # botocore # faker # freezegun @@ -377,6 +407,7 @@ python-slugify==8.0.1 # via # -r requirements/test.txt # code-annotations + # cookiecutter python-swiftclient==3.13.1 # via # -c requirements/constraints.txt @@ -395,6 +426,7 @@ pyyaml==6.0.1 # -r requirements/test.txt # cfn-lint # code-annotations + # cookiecutter # edx-i18n-tools # moto # responses @@ -406,10 +438,12 @@ regex==2023.6.3 requests==2.31.0 # via # -r requirements/test.txt + # cookiecutter # docker # moto # python-swiftclient # responses + # xblock-sdk responses==0.23.3 # via # -r requirements/test.txt @@ -430,6 +464,10 @@ selenium==3.141.0 # via # -r requirements/test-acceptance.in # bok-choy +simplejson==3.19.1 + # via + # -r requirements/test.txt + # xblock-sdk six==1.16.0 # via # -r requirements/test.txt @@ -437,6 +475,7 @@ six==1.16.0 # ecdsa # freezegun # fs + # fs-s3fs # html5lib # junit-xml # moto @@ -508,6 +547,7 @@ web-fragments==2.0.0 # via # -r requirements/test.txt # xblock + # xblock-sdk webencodings==0.5.1 # via # -r requirements/test.txt @@ -517,6 +557,7 @@ webob==1.8.7 # via # -r requirements/test.txt # xblock + # xblock-sdk websocket-client==1.6.1 # via # -r requirements/test.txt @@ -531,11 +572,11 @@ wrapt==1.11.2 # -r requirements/test.txt # aws-xray-sdk xblock==1.6.2 - # via -r requirements/test.txt -xblock-sdk==0.4.0 # via - # -c requirements/constraints.txt # -r requirements/test.txt + # xblock-sdk +xblock-sdk==0.7.0 + # via -r requirements/test.txt xmltodict==0.13.0 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index 47ba99735b..88f8193e64 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,6 +8,8 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs +arrow==1.2.3 + # via cookiecutter asgiref==3.7.2 # via # -r requirements/base.txt @@ -21,6 +23,8 @@ aws-sam-translator==1.72.0 # via cfn-lint aws-xray-sdk==2.12.0 # via moto +binaryornot==0.4.4 + # via cookiecutter bleach==6.0.0 # via -r requirements/base.txt boto==2.49.0 @@ -29,6 +33,7 @@ boto3==1.28.18 # via # -r requirements/base.txt # aws-sam-translator + # fs-s3fs # moto botocore==1.31.18 # via @@ -48,6 +53,8 @@ cffi==1.15.1 # pynacl cfn-lint==0.79.6 # via moto +chardet==5.2.0 + # via binaryornot charset-normalizer==3.2.0 # via # -r requirements/base.txt @@ -56,11 +63,14 @@ click==8.1.6 # via # -r requirements/base.txt # code-annotations + # cookiecutter # edx-django-utils code-annotations==1.5.0 # via # -r requirements/base.txt # edx-toggles +cookiecutter==2.2.3 + # via xblock-sdk coverage[toml]==7.2.7 # via # -r requirements/test.in @@ -150,7 +160,12 @@ fs==2.0.18 # via # -c requirements/constraints.txt # -r requirements/base.txt + # fs-s3fs # xblock +fs-s3fs==0.1.8 + # via + # -c requirements/constraints.txt + # xblock-sdk html5lib==1.1 # via -r requirements/base.txt idna==2.8 @@ -167,6 +182,7 @@ jinja2==3.1.2 # via # -r requirements/base.txt # code-annotations + # cookiecutter # moto jmespath==1.0.1 # via @@ -203,6 +219,7 @@ lxml==4.9.3 # via # -r requirements/base.txt # xblock + # xblock-sdk markupsafe==2.1.3 # via # -r requirements/base.txt @@ -284,6 +301,8 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils +pypng==0.20220715.0 + # via xblock-sdk pyrsistent==0.19.3 # via jsonschema pytest==7.4.0 @@ -295,10 +314,10 @@ pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in -python-dateutil==2.4.0 +python-dateutil==2.8.2 # via - # -c requirements/constraints.txt # -r requirements/base.txt + # arrow # botocore # faker # freezegun @@ -310,6 +329,7 @@ python-slugify==8.0.1 # via # -r requirements/base.txt # code-annotations + # cookiecutter python-swiftclient==3.13.1 # via # -c requirements/constraints.txt @@ -328,6 +348,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # cfn-lint # code-annotations + # cookiecutter # edx-i18n-tools # moto # responses @@ -337,10 +358,12 @@ regex==2023.6.3 requests==2.31.0 # via # -r requirements/base.txt + # cookiecutter # docker # moto # python-swiftclient # responses + # xblock-sdk responses==0.23.3 # via moto rsa==4.9 @@ -351,6 +374,8 @@ s3transfer==0.6.1 # boto3 sarif-om==1.0.4 # via cfn-lint +simplejson==3.19.1 + # via xblock-sdk six==1.16.0 # via # -r requirements/base.txt @@ -358,6 +383,7 @@ six==1.16.0 # ecdsa # freezegun # fs + # fs-s3fs # html5lib # junit-xml # moto @@ -419,6 +445,7 @@ web-fragments==2.0.0 # via # -r requirements/base.txt # xblock + # xblock-sdk webencodings==0.5.1 # via # -r requirements/base.txt @@ -428,6 +455,7 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock + # xblock-sdk websocket-client==1.6.1 # via docker werkzeug==2.3.6 @@ -437,11 +465,11 @@ wrapt==1.11.2 # -c requirements/constraints.txt # aws-xray-sdk xblock==1.6.2 - # via -r requirements/base.txt -xblock-sdk==0.4.0 # via - # -c requirements/constraints.txt - # -r requirements/test.in + # -r requirements/base.txt + # xblock-sdk +xblock-sdk==0.7.0 + # via -r requirements/test.in xmltodict==0.13.0 # via moto zipp==3.16.2