diff options
| author |   Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-26 14:20:36 +0100 |
|---|---|---|
| committer | Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-26 19:24:24 +0100 |
| commit | 01a60ff23b979eb676658713748598ba4892163a (patch) | |
| tree | 1fb1b260c3723ddc42f047796db6b1928171b48c /relationships | |
| parent | 77e27adeab5ff155b690f2e058c06f0a7812e225 (diff) | |
Support python3 in all plugins
Unify tox/requirements/setup.py requirement specifications.
Do not set upper version limits if possible.
Drop uuid as dependency included with standard library.
Drop import of unmaintained cloudify_importer without python3 version.
Use PEP 508 URLs in requirements for non-PyPI (github) releases.
Use cloudify-common 5 release; pre-release package for python3.
Rewrite uses of map with loops/comprehensions.
Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: DCAEGEN2-1956
Change-Id: I7b3ceb97a628e3af5bda3178d182f4207069e86d
Diffstat (limited to 'relationships')
| -rw-r--r-- | relationships/relationshipplugin/discovery.py | 6 | ||||
| -rw-r--r-- | relationships/requirements.txt | 4 | ||||
| -rw-r--r-- | relationships/setup.py | 4 | ||||
| -rw-r--r-- | relationships/tox.ini | 10 |
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 |