diff --git a/requirements-dev-py3.txt b/requirements-dev-py3.txt new file mode 100644 index 00000000..bd68d30f --- /dev/null +++ b/requirements-dev-py3.txt @@ -0,0 +1,10 @@ +# The following are only required in development, not production +nose +coverage +sphinx +pep8 +autopep8 + +# Required for optional extensions (only the ones supported on py3) +pystache +pyYaml diff --git a/requirements-dev.txt b/requirements-dev.txt index 8f369b47..8ed30c2a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,7 +8,5 @@ autopep8 # Required for optional extensions pystache pyYaml - -# Note that the following will fail to install on py3 configobj pylibmc diff --git a/scripts/travis.sh b/scripts/travis.sh index 29dcb3eb..b3c539cc 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -7,7 +7,12 @@ if [ "$PYCHECK" == "True" ]; then pip install argparse --use-mirrors fi -pip install -r requirements.txt --use-mirrors -pip install -r requirements-dev.txt --use-mirrors +PYCHECK=$(python -c 'import sys; print(sys.version_info > (3, 0))') +if [ "$PYCHECK" == "True" ]; then + pip install -r requirements-dev-py3.txt --use-mirrors +else + pip install -r requirements-dev.txt --use-mirrors +fi + python setup.py nosetests exit $?