From 0ea4630dcb592f918fc5d3dea06bc88b894765a6 Mon Sep 17 00:00:00 2001 From: arbi-bom Date: Thu, 10 Dec 2020 18:50:50 +0500 Subject: [PATCH 1/2] Constrained Cryptography version --- requirements/constraints.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c12d090b44..462c4f4eb5 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -128,6 +128,8 @@ pymongo<3.11 # vulture 2.0 requires Python >= 3.6 vulture<2.0 - # sympy latest version causing test failures. sympy==1.6.2 + +# cryptography 3.3.1 started failing tests on sandbox because it dropped support for python3.5 +cryptography==3.2.1 From 069d9058d6e15c25a31dec78c872760c6860c052 Mon Sep 17 00:00:00 2001 From: arbi-bom Date: Fri, 11 Dec 2020 18:16:22 +0500 Subject: [PATCH 2/2] Ran Make Upgrade on branch --- requirements/edx-sandbox/py35.txt | 4 ++-- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 1baf87c3b7..7a7f5724ec 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -9,7 +9,7 @@ common/lib/symmath # via -r requirements/edx-sandbox/py35.in cffi==1.14.4 # via -r requirements/edx-sandbox/shared.txt, cryptography chem==1.2.0 # via -r requirements/edx-sandbox/py35.in click==7.1.2 # via -r requirements/edx-sandbox/shared.txt, nltk -cryptography==3.3.1 # via -r requirements/edx-sandbox/shared.txt +cryptography==3.2.1 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.txt cycler==0.10.0 # via matplotlib decorator==4.4.2 # via networkx joblib==0.14.1 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.txt, nltk @@ -20,7 +20,7 @@ matplotlib==2.2.4 # via -c requirements/edx-sandbox/../constraints.txt, mpmath==1.1.0 # via sympy networkx==2.2 # via -r requirements/edx-sandbox/py35.in nltk==3.5 # via -r requirements/edx-sandbox/shared.txt, chem -numpy==1.16.5 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc, scipy +numpy==1.16.5 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc openedx-calc==1.0.9 # via -r requirements/edx-sandbox/py35.in pycparser==2.20 # via -r requirements/edx-sandbox/shared.txt, cffi pyparsing==2.2.0 # via -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 72d0382df3..fea46d3b54 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -6,7 +6,7 @@ # cffi==1.14.4 # via cryptography click==7.1.2 # via nltk -cryptography==3.3.1 # via -r requirements/edx-sandbox/shared.in +cryptography==3.2.1 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.in joblib==0.14.1 # via -c requirements/edx-sandbox/../constraints.txt, nltk lxml==4.5.0 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/shared.in nltk==3.5 # via -r requirements/edx-sandbox/shared.in diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4d49b120e6..fd8bce5c3e 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -42,7 +42,7 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/base.in coreapi==2.3.3 # via drf-yasg coreschema==0.0.4 # via coreapi, drf-yasg crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.in -cryptography==3.3.1 # via -r requirements/edx/../edx-sandbox/shared.txt, django-fernet-fields, edx-enterprise, pyjwt, social-auth-core +cryptography==3.2.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/../edx-sandbox/shared.txt, django-fernet-fields, edx-enterprise, pyjwt, social-auth-core cssutils==1.0.2 # via pynliner ddt==1.4.1 # via xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2958c17fd4..a4b64ce509 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -49,7 +49,7 @@ coreschema==0.0.4 # via -r requirements/edx/testing.txt, coreapi, drf-ya coverage==5.3 # via -r requirements/edx/testing.txt, pytest-cov git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt crowdsourcehinter-xblock==0.6 # via -r requirements/edx/testing.txt -cryptography==3.3.1 # via -r requirements/edx/testing.txt, django-fernet-fields, edx-enterprise, pyjwt, social-auth-core +cryptography==3.2.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-fernet-fields, edx-enterprise, pyjwt, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner ddt==1.4.1 # via -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 8aa90cd91b..08260d479b 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -48,7 +48,7 @@ coreschema==0.0.4 # via -r requirements/edx/base.txt, coreapi, drf-yasg coverage==5.3 # via -r requirements/edx/coverage.txt, pytest-cov git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.txt -cryptography==3.3.1 # via -r requirements/edx/base.txt, django-fernet-fields, edx-enterprise, pyjwt, social-auth-core +cryptography==3.2.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-fernet-fields, edx-enterprise, pyjwt, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner ddt==1.4.1 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll