Split requirements-optional so chardet works on Python 2 and 3.

gsnedders · gsnedders · commit caec8e9e881d · 2013-04-13T15:32:53.000+01:00
As the comment says, I am well aware how evil this is hardcoding the
Debian URL, but this allows for testing of all supported optional
extras, and given chardet is packaged for Python 3 in varies places,
this seems worthwhile to support.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,8 @@ before_install:
 install:
   - pip install -r requirements.txt -r requirements-test.txt --use-mirrors
   - if [[ $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional.txt --use-mirrors; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 3.* && $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional-2.txt --use-mirrors; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.* && $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional-3.txt --use-mirrors; fi
   - if [[ $TRAVIS_PYTHON_VERSION != "pypy" && $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional-cpython.txt --use-mirrors; fi
 
 script:
diff --git a/requirements-optional-2.txt b/requirements-optional-2.txt
@@ -0,0 +1,3 @@
+# chardet can be used as a fallback in case we are unable to determine
+# the encoding of a document.
+chardet
diff --git a/requirements-optional-3.txt b/requirements-optional-3.txt
@@ -0,0 +1,6 @@
+# chardet can be used as a fallback in case we are unable to determine
+# the encoding of a document.
+# And yes, I know it's evil hardcoding the Debian URL here. But alas,
+# there has never been a formal release supporting Python 3, though
+# several distros provide packages for it that support Python 3.
+http://ftp.us.debian.org/debian/pool/main/p/python3-chardet/python3-chardet_2.0.1.orig.tar.gz
diff --git a/requirements-optional.txt b/requirements-optional.txt
@@ -2,10 +2,6 @@
 # streams.
 genshi
 
-# chardet can be used as a fallback in case we are unable to determine
-# the encoding of a document.
-chardet
-
 # DATrie can be used in place of our Python trie implementation for
 # slightly better parsing performance.
 datrie

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# chardet can be used as a fallback in case we are unable to determine`
	`2`	`+# the encoding of a document.`
	`3`	`+chardet`