From 6173f2a993ffa31a4a72d0c372c2298224334313 Mon Sep 17 00:00:00 2001 From: Carlos Miguel Jenkins Perez Date: Mon, 8 Dec 2014 18:34:57 -0600 Subject: [PATCH] fix: dev: Fixing bad dependencies in PyPI. --- .travis.yml | 2 +- lib/pydotplus/version.py | 2 +- setup.py | 14 ++++++++++++++ tox.ini | 1 - 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e845cb..7641160 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python install: - sudo apt-get install graphviz - - pip install tox coveralls + - pip install -r requirements.dev.txt script: - tox after_success: diff --git a/lib/pydotplus/version.py b/lib/pydotplus/version.py index cdb64a9..5598df1 100644 --- a/lib/pydotplus/version.py +++ b/lib/pydotplus/version.py @@ -30,6 +30,6 @@ PyDotPlus version module. from __future__ import unicode_literals from __future__ import print_function -__version__ = '2.0.0-dev' +__version__ = '2.0.1' __all__ = ['__version__'] diff --git a/setup.py b/setup.py index 39b9024..3c9d546 100644 --- a/setup.py +++ b/setup.py @@ -41,12 +41,26 @@ def find_version(filename): raise RuntimeError('Unable to find version string.') +def find_requirements(requirements): + import string + with open(requirements, 'r') as fd: + reqs = [] + for line in fd: + line = line.strip() + if line and not line[:1] in string.ascii_letters: + reqs.append(line) + return reqs + + setup( name='pydotplus', version=find_version('lib/pydotplus/version.py'), package_dir={'': 'lib'}, packages=find_packages('lib'), + # Dependencies + install_requires=find_requirements('requirements.txt'), + # Metadata author='PyDotPlus Developers', author_email='carlos@jenkins.co.cr', diff --git a/tox.ini b/tox.ini index 66bfda8..e208121 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,6 @@ commands= deps= -rrequirements.txt pytest-cov - coveralls setenv= PYTHONPATH=lib/ commands=