Skip setuptools 46.0.0

setuptools 46.0.0 contradicts pyScss 1.3.4 because 'Feature' were deprecated. Please see pypa/setuptools#2017 Change-Id: Iafab38336daf5d84ef9e19248b59adccfacc29ec
openstack · Mar 9, 2020 · a8ff45a · a8ff45a
1 parent 2f2c92a
commit a8ff45a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/global-requirements.txt b/global-requirements.txt
@@ -512,7 +512,8 @@ selenium  # Apache-2.0
 # situations as progressive releases of projects are done.
 # Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951
 # Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086
-setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0;python_version>='3.5'  # PSF/ZPL
+# 46 & up contradicts with pyScss 1.3.4
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,!=46.0.0;python_version>='3.5'  # PSF/ZPL
 setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,<45.0.0;python_version<='2.7'  # PSF/ZPL
 sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'  # BSD
 sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4'  # BSD

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -7,6 +7,6 @@ stestr>=1.0.0  # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 virtualenv>=14.0.6 # MIT
-setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0,!=46.0.0 # PSF/ZPL
 mock>=2.0.0 # BSD
 bashate>=0.5.1 # Apache-2.0