diff --git a/requirements/base.txt b/requirements/base.txt index 16513ad..829d8ed 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,3 @@ -python-digitalocean PyYAML docopt requests diff --git a/setup.py b/setup.py index c930fdc..590b12c 100644 --- a/setup.py +++ b/setup.py @@ -13,11 +13,9 @@ 'pontoon.cmd' ] -requires = open("requirements/base.txt").read().split() +requires = open("requirements/base.txt").read().split() + ['python-digitalocean'] dependency_links = open("requirements/links.txt").read().split() -scripts = glob('scripts/pontoon*') - setup( name='pontoon', version=__version__, @@ -29,7 +27,6 @@ packages=packages, package_data={'': ['LICENSE']}, package_dir={'pontoon': 'pontoon'}, - # scripts=scripts, entry_points={ "console_scripts": [ "pontoon = pontoon.cmd.pontoon:main", @@ -44,8 +41,8 @@ ] }, include_package_data=True, - install_requires=requires, dependency_links=dependency_links, + install_requires=requires, license=open('LICENSE').read(), zip_safe=False, classifiers=( diff --git a/tox.ini b/tox.ini index a050782..c29f339 100644 --- a/tox.ini +++ b/tox.ini @@ -12,11 +12,11 @@ commands = pip install . [testenv:lib] deps = -rrequirements/base.txt -rrequirements/lib.txt - -rrequirements/links.txt commands = python setup.py install py.test --pep8 pontoon [testenv:cli] whitelist_externals = bats +deps = -rrequirements/base.txt commands = python setup.py install bats --tap test/bats [testenv:coverage]