From: Michael Hwang <mhwang@research.att.com>
Date: Fri, 2 Mar 2018 15:18:27 +0000 (-0500)
Subject: Bound the dcaepolicylib abstract requirement
X-Git-Tag: 2.0.0-ONAP~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F33817%2F1;p=dcaegen2%2Fplatform%2Fplugins.git

Bound the dcaepolicylib abstract requirement

This is needed because of a potential bug in wagon where instead of
just taking dependencies from requirements.txt.  Wagon meets the
requirements of both requirements.txt and the abstract requirements in
setup.py.  This is when running wagon with the "-r".

Change-Id: If6aebb5b4d98c34e379bdfaa5ff0f7af4fa3504b
Issue-ID: DCAEGEN2-377
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---

diff --git a/cdap/cdapplugin/setup.py b/cdap/cdapplugin/setup.py
index 8774699..6ca9461 100644
--- a/cdap/cdapplugin/setup.py
+++ b/cdap/cdapplugin/setup.py
@@ -32,7 +32,7 @@ setup(
     url = "https://gerrit.onap.org/r/#/admin/projects/dcaegen2/platform/plugins",
     zip_safe=False,
     install_requires = [
-        "onap-dcae-dcaepolicy-lib",
+        "onap-dcae-dcaepolicy-lib>=1.0.0,<2.0.0"
         "uuid==1.30"
     ]
 )
diff --git a/docker/setup.py b/docker/setup.py
index ececb43..3585984 100644
--- a/docker/setup.py
+++ b/docker/setup.py
@@ -32,6 +32,6 @@ setup(
         "python-consul>=0.6.0,<1.0.0",
         "onap-dcae-dockering>=1.0.0,<2.0.0",
         "uuid==1.30",
-        "onap-dcae-dcaepolicy-lib>=1.0.0"
+        "onap-dcae-dcaepolicy-lib>=1.0.0,<2.0.0"
     ]
 )