Support python3 in all plugins

Unify tox/requirements/setup.py requirement specifications.
Use cloudify-common 5.0.5 release.
For helm, use a dev cloudify-common build with better python3 code.
Use PEP 508 URLs in requirements for the non-PyPI (github) release.
Fix mixed indentation and trailing whitespace.

Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: CCSDK-1931
Change-Id: I607957d9e2c299121785f3f02420c6038966a200

5 files changed, 12 insertions, 8 deletions

diff --git a/sshkeyshare/pom.xml b/sshkeyshare/pom.xml
index 759d57c..a852401 100644
--- a/sshkeyshare/pom.xml
+++ b/sshkeyshare/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
   <artifactId>sshkeyshare</artifactId>
   <name>sshkeyshare</name>
 
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <!-- name from the setup.py file -->
diff --git a/sshkeyshare/requirements.txt b/sshkeyshare/requirements.txt
index e69de29..833d57a 100644
--- a/sshkeyshare/requirements.txt
+++ b/sshkeyshare/requirements.txt
@@ -0,0 +1 @@
+cloudify-common>=5.0.5
diff --git a/sshkeyshare/setup.py b/sshkeyshare/setup.py
index 56371ff..d8ee3db 100644
--- a/sshkeyshare/setup.py
+++ b/sshkeyshare/setup.py
@@ -2,13 +2,14 @@
 # org.onap.ccsdk
 # =============================================================================
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 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.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +22,7 @@ from setuptools import setup, find_packages
 
 setup(
   name='sshkeyshare',
-  version='1.0.0',
+  version='1.1.0',
   packages=find_packages(),
   author='AT&T',
   description=('Cloudify plugin for creating ssh keypairs on the fly.'),
@@ -31,5 +32,6 @@ setup(
   zip_safe=False,
   package_data={'':['LICENSE.txt']},
   install_requires=[
-  ]
+    'cloudify-common>=5.0.5',
+  ],
 )
diff --git a/sshkeyshare/sshkey_types.yaml b/sshkeyshare/sshkey_types.yaml
index c8e8b06..1e456d5 100644
--- a/sshkeyshare/sshkey_types.yaml
+++ b/sshkeyshare/sshkey_types.yaml
@@ -6,7 +6,7 @@ plugins:
   ssh_keyshare:
     executor: central_deployment_agent
     package_name: sshkeyshare
-    package_version: 1.0.0
+    package_version: 1.1.0
 node_types:
   ccsdk.nodes.ssh.keypair:
     derived_from: cloudify.nodes.Root
diff --git a/sshkeyshare/tox.ini b/sshkeyshare/tox.ini
index e2aff1e..f49fe9f 100644
--- a/sshkeyshare/tox.ini
+++ b/sshkeyshare/tox.ini
@@ -1,6 +1,7 @@
 # ============LICENSE_START====================================================
 # =============================================================================
 # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 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.
@@ -16,15 +17,15 @@
 # ============LICENSE_END======================================================
 
 [tox]
-envlist = py27
+envlist = py27,py36,py37
 skip_missing_interpreters = true
 
 [testenv]
 deps=
-    cloudify==3.4
     pytest
     coverage
     pytest-cov
+    -r requirements.txt
 setenv=
     PYTHONPATH={toxinidir}
 commands=