Merge pull request #1426 from arve0/dependencies

install_requires from requirements.txt
This commit is contained in:
Steven Silvester
2015-03-24 12:31:38 -05:00
2 changed files with 4 additions and 4 deletions
+1 -3
View File
@@ -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
+3 -1
View File
@@ -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