diff --git a/setup.py b/setup.py index 0c76b698..cba8dbb7 100755 --- a/setup.py +++ b/setup.py @@ -153,9 +153,7 @@ if __name__ == "__main__": ], configuration=configuration, - install_requires=[ - "six>=%s" % DEPENDENCIES['six'] - ], + install_requires=[dep for dep in DEPENDENCIES], packages=setuptools.find_packages(exclude=['doc']), include_package_data=True, zip_safe=False, # the package can run out of an .egg file diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh index f98e48de..b9a34059 100755 --- a/tools/travis_before_install.sh +++ b/tools/travis_before_install.sh @@ -41,11 +41,13 @@ else fi source ~/venv/bin/activate -retry pip install wheel flake8 coveralls nose +retry pip install wheel flake8 coveralls nose sphinx # install system tk for matplotlib sudo apt-get install python-tk +# try to solve #1426 +sudo apt-get install --reinstall python-pkg-resources # on Python 3.2, use matplotlib 1.3.1 if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then