convert requirements-*.txt to be inclusive; flake8 script introduced

ambv · ambv · commit dede1f2a3865 · 2013-05-17T11:34:46.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -26,16 +26,11 @@ before_install:
   - git submodule update --init --recursive
 
 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 == "2.6" && $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional-2.6.txt --use-mirrors; fi
-  - if [[ $TRAVIS_PYTHON_VERSION != "pypy" && $USE_OPTIONAL == "true" ]]; then pip install -r requirements-optional-cpython.txt --use-mirrors; fi
-  - if [[ $FLAKE == "true" ]]; then pip install --use-mirrors flake8; fi
+  - bash requirements-install.sh
 
 script:
   - nosetests
-  - if [[ $FLAKE == "true" ]]; then find html5lib/ -name '*.py' -and -not -name 'constants.py' -print0 | xargs -0 flake8 --ignore=E501; fi
-  - if [[ $FLAKE == "true" ]]; then flake8 --max-line-length=99 --ignore=E126 html5lib/constants.py; fi
+  - bash flake8-run.sh
 
 after_script:
   - python debug-info.py
diff --git a/flake8-run.sh b/flake8-run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+if [[ ! -x $(which flake8) ]]; then
+  echo "fatal: flake8 not found on $PATH. Exiting."
+  exit 1
+fi
+
+if [[ $FLAKE == "true" ]]; then
+  find html5lib/ -name '*.py' -and -not -name 'constants.py' -print0 | xargs -0 flake8 --ignore=E501
+  flake8 --max-line-length=99 --ignore=E126 html5lib/constants.py
+fi
diff --git a/requirements-install.sh b/requirements-install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
+  echo "fatal: \$USE_OPTIONAL not set to true or false. Exiting."
+  exit 1
+fi
+
+pip install -r requirements-test.txt --use-mirrors
+
+if [[ $USE_OPTIONAL == "true" && $TRAVIS_PYTHON_VERSION != "pypy" ]]; then
+  if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then
+    pip install -r requirements-optional-2.6.txt --use-mirrors
+  else
+    pip install -r requirements-optional-cpython.txt --use-mirrors
+  fi
+fi
+
+if [[ $FLAKE == "true" ]]; then
+  pip install --use-mirrors flake8
+fi
diff --git a/requirements-optional-2.6.txt b/requirements-optional-2.6.txt
@@ -1,3 +1,5 @@
+-r requirements-optional-cpython.txt
+
 # Can be used to force attributes to be serialized in alphabetical
 # order.
 ordereddict
diff --git a/requirements-optional-cpython.txt b/requirements-optional-cpython.txt
@@ -1,3 +1,5 @@
+-r requirements-optional.txt
+
 # lxml is supported with its own treebuilder ("lxml") and otherwise
 # uses the standard ElementTree support
 lxml
diff --git a/requirements-optional.txt b/requirements-optional.txt
@@ -1,3 +1,5 @@
+-r requirements.txt
+
 # We support a Genshi treewalker that can be used to serialize Genshi
 # streams.
 genshi
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,2 +1,4 @@
+-r requirements.txt
+
 nose
 ordereddict # Python 2.6
diff --git a/tox.ini b/tox.ini
@@ -3,14 +3,11 @@ envlist = py26,py27,py32,py33
 
 [testenv]
 deps =
-  charade
-  datrie
-  Genshi
-  lxml
+  -r{toxinidir}/requirements-optional-cpython.txt
   nose
-  six
 commands =
   {envbindir}/nosetests -q
+  {toxinidir}/flake8-run.sh
 
 [testenv:pypy]
 # lxml doesn't work and datrie doesn't make sense
@@ -24,10 +21,5 @@ deps =
 [testenv:py26]
 basepython = python2.6
 deps =
-  charade
-  datrie
-  Genshi
-  lxml
+  -r{toxinidir}/requirements-optional-2.6.txt
   nose
-  six
-  ordereddict

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+-r requirements.txt`
	`2`	`+`
`1`	`3`	`# We support a Genshi treewalker that can be used to serialize Genshi`
`2`	`4`	`# streams.`
`3`	`5`	`genshi`
-Original file line number
+Diff line change
@@ @@ -1,2 +1,4 @@ @@
 +-r requirements.txt
++
 nose
 ordereddict # Python 2.6