From d729c0f0a518eabc7cb854f2fc9cd748903ed69b Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Fri, 23 Jul 2021 11:59:22 +0500 Subject: [PATCH] Fix: Removed unnecessary constraints (#28120) fix: removed zipp and stevedore constraints fix: removed kiwisolver and joblib constraints --- requirements/constraints.txt | 4 +--- requirements/edx-sandbox/py35-constraints.txt | 4 ---- requirements/edx-sandbox/py35.txt | 2 -- requirements/edx-sandbox/py38.txt | 15 ++++----------- requirements/edx/base.txt | 6 ++---- requirements/edx/development.txt | 10 ++-------- requirements/edx/testing.txt | 11 +++-------- 7 files changed, 12 insertions(+), 40 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index be4bb20797..68baf2f796 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -98,7 +98,5 @@ pylint==2.8.3 # constraints present due to Python35 support. Need to be tested and removed independently. -joblib<0.15.0 # 0.15.0 dropped support for Python 3.5 +# jsonfield2 will be replaced with jsonfield in https://openedx.atlassian.net/browse/BOM-1917. jsonfield2<3.1.0 # jsonfield2 3.1.0 drops support for python 3.5 -kiwisolver<1.2.0 # kiwisolver 1.2.0 requires Python 3.6+ -zipp==1.0.0 # zipp 2.0.0 requires Python >= 3.6 diff --git a/requirements/edx-sandbox/py35-constraints.txt b/requirements/edx-sandbox/py35-constraints.txt index b33d711c01..c8cb6ea2b7 100644 --- a/requirements/edx-sandbox/py35-constraints.txt +++ b/requirements/edx-sandbox/py35-constraints.txt @@ -16,14 +16,10 @@ matplotlib<3.1 # Matplotlib 3.1 requires Python 3.6 numpy<1.19.0 # numpy 1.19.0 drops support for Python 3.5 -stevedore<2.0.0 # stevedore 2.0.0 requires python >= 3.6 - scipy<1.5.0 # scipy 1.5.0 drops support for Python 3.5 sympy<1.7.0 # sympy 1.7.0 drops support for Python 3.5 -zipp==1.0.0 # zipp 2.0.0 requires Python >= 3.6 - markupsafe<2.0.0 # markupsafe 2.0.0 requires Python >= 3.6 cryptography<3.3 # cryptography 3.3 has dropped python3.5 support. diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index ea1eca9f8f..7f18ff239a 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -26,12 +26,10 @@ decorator==5.0.9 # via networkx joblib==0.14.1 # via - # -c requirements/edx-sandbox/../constraints.txt # -c requirements/edx-sandbox/py35-constraints.txt # nltk kiwisolver==1.1.0 # via - # -c requirements/edx-sandbox/../constraints.txt # -c requirements/edx-sandbox/py35-constraints.txt # matplotlib lxml==4.5.0 diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index 280eef217a..9576d1197b 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -22,14 +22,10 @@ cycler==0.10.0 # via matplotlib decorator==4.4.2 # via networkx -joblib==0.14.1 - # via - # -c requirements/edx-sandbox/../constraints.txt - # nltk -kiwisolver==1.1.0 - # via - # -c requirements/edx-sandbox/../constraints.txt - # matplotlib +joblib==1.0.1 + # via nltk +kiwisolver==1.3.1 + # via matplotlib lxml==4.5.0 # via # -c requirements/edx-sandbox/../constraints.txt @@ -94,6 +90,3 @@ sympy==1.6.2 # symmath tqdm==4.61.2 # via nltk - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 473fd1be96..cac7803bfe 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -569,10 +569,8 @@ jmespath==0.10.0 # via # boto3 # botocore -joblib==0.14.1 - # via - # -c requirements/edx/../constraints.txt - # nltk +joblib==1.0.1 + # via nltk jsondiff==1.3.0 # via edx-enterprise jsonfield2==3.0.3 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 02ad9e7799..8408dd2b34 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -740,9 +740,8 @@ jmespath==0.10.0 # -r requirements/edx/testing.txt # boto3 # botocore -joblib==0.14.1 +joblib==1.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # nltk jsondiff==1.3.0 @@ -853,10 +852,6 @@ monotonic==1.6 # via # -r requirements/edx/testing.txt # analytics-python -more-itertools==8.8.0 - # via - # -r requirements/edx/testing.txt - # zipp mpmath==1.2.1 # via # -r requirements/edx/testing.txt @@ -1510,9 +1505,8 @@ yarl==1.6.3 # via # -r requirements/edx/testing.txt # aiohttp -zipp==1.0.0 +zipp==3.5.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # importlib-metadata diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 6710cf2308..c24f7d15f0 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -707,9 +707,8 @@ jmespath==0.10.0 # -r requirements/edx/base.txt # boto3 # botocore -joblib==0.14.1 +joblib==1.0.1 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # nltk jsondiff==1.3.0 @@ -811,8 +810,6 @@ monotonic==1.6 # via # -r requirements/edx/base.txt # analytics-python -more-itertools==8.8.0 - # via zipp mpmath==1.2.1 # via # -r requirements/edx/base.txt @@ -1396,10 +1393,8 @@ yarl==1.6.3 # via # -r requirements/edx/base.txt # aiohttp -zipp==1.0.0 - # via - # -c requirements/edx/../constraints.txt - # importlib-metadata +zipp==3.5.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools