From 7888027425262f9c16c91ed0d71ab8683a9496fd Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Mon, 6 Jan 2014 15:09:56 +0000 Subject: [PATCH] Put requirements back in .txt files Read-only FS in travis --- requirements-dev.txt | 2 ++ requirements.txt | 5 +++++ script/travis-install | 0 setup.py | 18 +++++++----------- 4 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 requirements-dev.txt create mode 100644 requirements.txt mode change 100644 => 100755 script/travis-install diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 000000000..4ef6576c4 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,2 @@ +nose==1.3.0 +unittest2==0.5.1 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..bfc910939 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +docker-py==0.2.3 +docopt==0.6.1 +PyYAML==3.10 +# docker requires six==1.3.0 +six==1.3.0 diff --git a/script/travis-install b/script/travis-install old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py index a114bdf97..f0ffceb74 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,11 @@ def find_version(*file_paths): return version_match.group(1) raise RuntimeError("Unable to find version string.") +with open('requirements.txt') as f: + install_requires = f.read().splitlines() + +with open('requirements-dev.txt') as f: + tests_require = f.read().splitlines() setup( name='fig', @@ -33,17 +38,8 @@ setup( packages=find_packages(), include_package_data=True, test_suite='nose.collector', - install_requires=[ - 'docker-py==0.2.3', - 'docopt==0.6.1', - 'PyYAML==3.10', - # unfortunately `docker` requires six ==1.3.0 - 'six==1.3.0', - ], - tests_require=[ - 'nose==1.3.0', - 'unittest2==0.5.1' - ], + install_requires=install_requires, + tests_require=tests_require, entry_points=""" [console_scripts] fig=fig.cli.main:main