From 16b2b119fdfdf4d149d50eac0781f7a9efbc5805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 3 Mar 2017 12:33:01 +0100 Subject: [PATCH] Referring to Pillar Python SDK requirements This forces us to remove common requirements from Pillar's requirements.txt file (which is a good thing). --- requirements-dev.txt | 3 +++ requirements.txt | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1c5f40f6..32a73467 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,12 @@ -r requirements.txt +-e ../pillar-python-sdk +-e . # Development requirements pytest==3.0.1 responses==0.5.1 pytest-cov==2.3.1 +mock==2.0.0 # Secondary development requirements cookies==2.2.1 diff --git a/requirements.txt b/requirements.txt index fe79316f..fea38733 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ # Primary requirements -# pillarsdk +-r ../pillar-python-sdk/requirements.txt + attrs==16.2.0 algoliasearch==1.8.0 bcrypt==2.0.0 @@ -19,11 +20,9 @@ Flask-WTF==0.12 gcloud==0.12.0 google-apitools==0.4.11 httplib2==0.9.2 -idna==2.0 MarkupSafe==0.23 ndg-httpsclient==0.4.0 Pillow==2.8.1 -pycparser==2.14 pycrypto==2.6.1 pyOpenSSL==0.15.1 python-dateutil==2.5.3 @@ -39,9 +38,7 @@ Flask-PyMongo==0.4.1 Jinja2==2.8 Werkzeug==0.11.10 appdirs==1.4.2 -cffi==1.6.0 CommonMark==0.7.2 -cryptography==1.3.1 future==0.15.2 html5lib==0.9999999 googleapis-common-protos==1.1.0 @@ -51,7 +48,6 @@ oauthlib==2.0.1 packaging==16.8 protobuf==3.0.0b2.post2 protorpc==0.11.1 -pyasn1==0.1.9 pyasn1-modules==0.0.8 pymongo==3.2.2 pyparsing==2.1.10