Merge pull request html5lib#285 from jayvdb/envmarker-monkeypatching

gsnedders · web-flow · commit 43aeaefe3497 · 2016-07-26T13:23:53.000+01:00
Monkeypatch pkg_resources to always use _markerlib; r=gsnedders
diff --git a/requirements-install.sh b/requirements-install.sh
@@ -5,9 +5,6 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
   exit 1
 fi
 
-# Make sure we're running setuptools >= 18.5
-pip install -U pip setuptools>=18.5
-
 pip install -U -r requirements-test.txt
 
 if [[ $USE_OPTIONAL == "true" ]]; then
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -4,4 +4,3 @@ flake8
 pytest
 pytest-expect>=1.1,<2.0
 mock
-ordereddict ; python_version < '2.7'
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 six
 webencodings
 ordereddict ; python_version < '2.7'
-setuptools>=18.5
diff --git a/setup.py b/setup.py
@@ -8,10 +8,54 @@
 from setuptools import setup, find_packages, __version__ as setuptools_version
 from pkg_resources import parse_version
 
-if parse_version(setuptools_version) < parse_version("18.5"):
-    print("html5lib requires setuptools version 18.5 or above; "
-          "please upgrade before installing (you have %s)" % setuptools_version)
-    sys.exit(1)
+import pkg_resources
+
+try:
+    import _markerlib.markers
+except ImportError:
+    _markerlib = None
+
+
+# _markerlib.default_environment() obtains its data from _VARS
+# and wraps it in another dict, but _markerlib_evaluate writes
+# to the dict while it is iterating the keys, causing an error
+# on Python 3 only.
+# Replace _markerlib.default_environment to return a custom dict
+# that has all the necessary markers, and ignores any writes.
+
+class Python3MarkerDict(dict):
+
+    def __setitem__(self, key, value):
+        pass
+
+    def pop(self, i=-1):
+        return self[i]
+
+
+if _markerlib and sys.version_info[0] == 3:
+    env = _markerlib.markers._VARS
+    for key in list(env.keys()):
+        new_key = key.replace('.', '_')
+        if new_key != key:
+            env[new_key] = env[key]
+
+    _markerlib.markers._VARS = Python3MarkerDict(env)
+
+    def default_environment():
+        return _markerlib.markers._VARS
+
+    _markerlib.default_environment = default_environment
+
+# Avoid the very buggy pkg_resources.parser, which doesnt consistently
+# recognise the markers needed by this setup.py
+# Change this to setuptools 20.10.0 to support all markers.
+if pkg_resources:
+    if parse_version(setuptools_version) < parse_version('18.5'):
+        MarkerEvaluation = pkg_resources.MarkerEvaluation
+
+        del pkg_resources.parser
+        pkg_resources.evaluate_marker = MarkerEvaluation._markerlib_evaluate
+        MarkerEvaluation.evaluate_marker = MarkerEvaluation._markerlib_evaluate
 
 classifiers = [
     'Development Status :: 5 - Production/Stable',
@@ -60,7 +104,6 @@
       install_requires=[
           'six',
           'webencodings',
-          'setuptools>=18.5'
       ],
       extras_require={
           # A empty extra that only has a conditional marker will be
