From cd1723642830c493f8136408bc2d1c43c8331cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 3 Mar 2017 15:04:50 +0100 Subject: [PATCH] Linked requirements to Pillar and Pillar-Python-SDK Since Pillar is not pip-installable and also not properly versioned either, I removed the 'pillar>=2.0' requirement from setup.py --- requirements-dev.txt | 5 +++++ requirements.txt | 11 +---------- setup.py | 4 +--- 3 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 requirements-dev.txt diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..56bd894 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,5 @@ +# Development requirements +-r ../pillar/requirements-dev.txt + +-e ../pillar-python-sdk +-e ../pillar diff --git a/requirements.txt b/requirements.txt index 645f0bf..9182d47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,4 @@ # Primary requirements: -# pillarsdk -# pillar +-r ../pillar/requirements.txt -attrs==16.2.0 svn==0.3.43 -python-dateutil==2.5.3 - -# Testing requirements: -pytest==3.0.1 -responses==0.5.1 -pytest-cov==2.3.1 -mock==2.0.0 diff --git a/setup.py b/setup.py index df5e8fe..e575ac3 100644 --- a/setup.py +++ b/setup.py @@ -8,9 +8,7 @@ setuptools.setup( name='attract', version='1.0', packages=setuptools.find_packages('.', exclude=['test']), - install_requires=[ - 'pillar>=2.0', - ], + install_requires=[], tests_require=[ 'pytest>=2.9.1', 'responses>=0.5.1',