Try fixing html5lib#231 again: Return to using platform_python_implementation

gsnedders · gsnedders · commit 1603fe851d4f · 2016-06-06T18:15:32.000+01:00
This makes us require setuptools&gt;=18.5
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,14 @@ cache:
 env:
   - USE_OPTIONAL=true
   - USE_OPTIONAL=false
+  - USE_OPTIONAL=true SETUPTOOLS=18.5
+  - USE_OPTIONAL=false SETUPTOOLS=18.5
+  - USE_OPTIONAL=true SETUPTOOLS=20.2.2
+  - USE_OPTIONAL=false SETUPTOOLS=20.2.2
+  - USE_OPTIONAL=true SETUPTOOLS=20.6.6
+  - USE_OPTIONAL=false SETUPTOOLS=20.6.6
+  - USE_OPTIONAL=true SETUPTOOLS=20.10.0
+  - USE_OPTIONAL=false SETUPTOOLS=20.10.0
 
 before_install:
   - git submodule update --init --recursive
diff --git a/requirements-install.sh b/requirements-install.sh
@@ -6,7 +6,12 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
 fi
 
 # Make sure we're running setuptools >= 18.5
-pip install -U pip setuptools
+pip install -U pip setuptools>=18.5
+
+# Install specific version of setuptools, maybe
+if [ -n "$SETUPTOOLS" ]; then
+ pip install "setuptools==$SETUPTOOLS"
+fi
 
 pip install -U -r requirements-test.txt
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 six
 webencodings
 ordereddict ; python_version < '2.7'
+setuptools>=18.5
diff --git a/setup.py b/setup.py
@@ -52,6 +52,7 @@
       install_requires=[
           'six',
           'webencodings',
+          'setuptools>=18.5'
       ],
       extras_require={
           # A empty extra that only has a conditional marker will be
@@ -60,8 +61,8 @@
 
           # A conditional extra will only install these items when the extra is
           # requested and the condition matches.
-          "datrie:platform.python_implementation == 'CPython'": ["datrie"],
-          "lxml:platform.python_implementation == 'CPython'": ["lxml"],
+          "datrie:platform_python_implementation == 'CPython'": ["datrie"],
+          "lxml:platform_python_implementation == 'CPython'": ["lxml"],
 
           # Standard extras, will be installed when the extra is requested.
           "genshi": ["genshi"],
@@ -72,6 +73,6 @@
           # extra that will be installed whenever the condition matches and the
           # all extra is requested.
           "all": ["genshi", "chardet>=2.2"],
-          "all:platform.python_implementation == 'CPython'": ["datrie", "lxml"],
+          "all:platform_python_implementation == 'CPython'": ["datrie", "lxml"],
       },
       )
