summaryrefslogtreecommitdiffstats
path: root/relationships
diff options
context:
space:
mode:
Diffstat (limited to 'relationships')
-rw-r--r--relationships/relationshipplugin/discovery.py6
-rw-r--r--relationships/requirements.txt4
-rw-r--r--relationships/setup.py4
-rw-r--r--relationships/tox.ini10
4 files changed, 15 insertions, 9 deletions
diff --git a/relationships/relationshipplugin/discovery.py b/relationships/relationshipplugin/discovery.py
index bd0e369..1b87a65 100644
--- a/relationships/relationshipplugin/discovery.py
+++ b/relationships/relationshipplugin/discovery.py
@@ -2,6 +2,7 @@
# org.onap.dcae
# ================================================================================
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,10 @@
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-from urlparse import urlparse
+try:
+ from urllib.parse import urlparse
+except ImportError:
+ from urlparse import urlparse
import json
import consul
diff --git a/relationships/requirements.txt b/relationships/requirements.txt
index 5d5d52e..2a92bd4 100644
--- a/relationships/requirements.txt
+++ b/relationships/requirements.txt
@@ -1 +1,3 @@
-python-consul==0.6.1
+python-consul>=0.6.1
+cloudify-common>=5.0.0; python_version<"3"
+cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.0; python_version>="3"
diff --git a/relationships/setup.py b/relationships/setup.py
index e576d3c..7facd65 100644
--- a/relationships/setup.py
+++ b/relationships/setup.py
@@ -2,6 +2,7 @@
# org.onap.dcae
# ================================================================================
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -29,6 +30,7 @@ setup(
packages=['relationshipplugin'],
zip_safe=False,
install_requires=[
- "python-consul>=0.6.0"
+ 'python-consul>=0.6.1',
+ 'cloudify-common>=5.0.0',
]
)
diff --git a/relationships/tox.ini b/relationships/tox.ini
index a7157be..499accb 100644
--- a/relationships/tox.ini
+++ b/relationships/tox.ini
@@ -1,15 +1,13 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
-envlist = py27
+envlist = py27,py36
[testenv]
deps=
- cloudify-plugins-common==3.4
+ -rrequirements.txt
pytest
coverage
pytest-cov
-setenv=
- PYTHONPATH={toxinidir}
commands=
- pytest --junitxml xunit-results.xml --cov relationshipplugin --cov-report xml
- coverage xml
+ pytest --junitxml xunit-results.xml --cov relationshipplugin --cov-report xml
+ coverage xml