Update requirements files to match setup.py

Author: gsnedders

requirements-install.sh

@@ -5,14 +5,11 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
   exit 1
 fi
 
+# Make sure we're running setuptools >= 18.5
+pip install -U pip setuptools
+
 pip install -U -r requirements-test.txt
 
 if [[ $USE_OPTIONAL == "true" ]]; then
-  if [[ $TRAVIS_PYTHON_VERSION == "pypy" || $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then
-    pip install -U -r requirements-optional.txt
-  elif [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then
-    pip install -U -r requirements-optional-2.6.txt
-  else
-    pip install -U -r requirements-optional-cpython.txt
-  fi
+  pip install -U -r requirements-optional.txt
 fi

requirements-optional-2.6.txt

@@ -7,3 +7,15 @@ genshi
 # charade can be used as a fallback in case we are unable to determine
 # the encoding of a document.
 charade
+
+# lxml is supported with its own treebuilder ("lxml") and otherwise
+# uses the standard ElementTree support
+lxml ; platform_python_implementation == 'CPython'
+
+# DATrie can be used in place of our Python trie implementation for
+# slightly better parsing performance.
+datrie ; platform_python_implementation == 'CPython'
+
+# Can be used to force attributes to be serialized in alphabetical
+# order.
+ordereddict ; python_version < '2.7'

requirements-optional-cpython.txt

@@ -2,5 +2,5 @@
 
 flake8
 nose
-ordereddict # Python 2.6
 mock
+ordereddict ; python_version < '2.7'

requirements-optional.txt

@@ -7,9 +7,7 @@ deps =
   nose
   mock
   py26-base: ordereddict
-  py26-optional: -r{toxinidir}/requirements-optional-2.6.txt
-  {py27,py32,py33,py34,py35}-optional: -r{toxinidir}/requirements-optional-cpython.txt
-  {pypy,pypy3}-optional: -r{toxinidir}/requirements-optional.txt
+  optional: -r{toxinidir}/requirements-optional.txt
 
 commands =
   {envbindir}/nosetests -q