Cease supporting DATrie under PyPy.

gsnedders · gsnedders · commit 9ee8a1a811e6 · 2015-12-03T04:37:37.000Z
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,8 @@ Released on XXX
 
 * Now requires the ``mock`` package for the testsuite.
 
+* Cease supporting DATrie under PyPy.
+
 
 0.9999999/1.0b8
 ~~~~~~~~~~~~~~~
diff --git a/README.rst b/README.rst
@@ -104,8 +104,8 @@ Optional Dependencies
 The following third-party libraries may be used for additional
 functionality:
 
-- ``datrie`` can be used to improve parsing performance (though in
-  almost all cases the improvement is marginal);
+- ``datrie`` can be used under CPython to improve parsing performance
+  (though in almost all cases the improvement is marginal);
 
 - ``lxml`` is supported as a tree format (for both building and
   walking) under CPython (but *not* PyPy where it is known to cause
diff --git a/requirements-optional-cpython.txt b/requirements-optional-cpython.txt
@@ -3,3 +3,7 @@
 # lxml is supported with its own treebuilder ("lxml") and otherwise
 # uses the standard ElementTree support
 lxml
+
+# DATrie can be used in place of our Python trie implementation for
+# slightly better parsing performance.
+datrie
diff --git a/requirements-optional.txt b/requirements-optional.txt
@@ -4,10 +4,6 @@
 # streams.
 genshi
 
-# DATrie can be used in place of our Python trie implementation for
-# slightly better parsing performance.
-datrie
-
 # charade can be used as a fallback in case we are unable to determine
 # the encoding of a document.
 charade
diff --git a/setup.py b/setup.py
@@ -65,18 +65,18 @@
 
           # A conditional extra will only install these items when the extra is
           # requested and the condition matches.
+          "datrie:python_implementation == 'CPython'": ["datrie"],
           "lxml:python_implementation == 'CPython'": ["lxml"],
 
           # Standard extras, will be installed when the extra is requested.
           "genshi": ["genshi"],
-          "datrie": ["datrie"],
           "charade": ["charade"],
 
           # The all extra combines a standard extra which will be used anytime
           # the all extra is requested, and it extends it with a conditional
           # extra that will be installed whenever the condition matches and the
           # all extra is requested.
-          "all": ["genshi", "datrie", "charade"],
-          "all:python_implementation == 'CPython'": ["lxml"],
+          "all": ["genshi", "charade"],
+          "all:python_implementation == 'CPython'": ["datrie", "lxml"],
       },
       )
