From 2107ab24a93d9138f677008ba808f0bdd416b7f2 Mon Sep 17 00:00:00 2001 From: arve0 Date: Fri, 13 Mar 2015 17:42:38 +0100 Subject: [PATCH 1/3] install_requires from requirements.txt --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 From 98ad6027809ae3067c23ab2fb26dd9611c4a3775 Mon Sep 17 00:00:00 2001 From: arve0 Date: Sun, 15 Mar 2015 12:51:13 +0100 Subject: [PATCH 2/3] install sphinx before running tests in travis --- tools/travis_before_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh index f98e48de..9b251941 100755 --- a/tools/travis_before_install.sh +++ b/tools/travis_before_install.sh @@ -41,7 +41,7 @@ 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 From 3c6e00083f944ac7cc2fb822fadb788722df3b16 Mon Sep 17 00:00:00 2001 From: arve0 Date: Tue, 17 Mar 2015 10:59:20 +0100 Subject: [PATCH 3/3] add some more magic --- tools/travis_before_install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh index 9b251941..b9a34059 100755 --- a/tools/travis_before_install.sh +++ b/tools/travis_before_install.sh @@ -46,6 +46,8 @@ 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