From 6abf6dc0d1ea75f13c602231dfbb123dd1edc481 Mon Sep 17 00:00:00 2001
From: Mickael JEZEQUEL <mickael.jezequel@orange.com>
Date: Tue, 20 Mar 2018 17:03:01 +0100
Subject: Update python packages content and version

Change-Id: I6bd957c69f130167607be91343d9074a5a826f5f
Issue-ID: VNFSDK-41
Signed-off-by: Mickael JEZEQUEL <mickael.jezequel@orange.com>
---
 ice-server/LICENSE.txt         | 19 +++++++++++++++++++
 ice-server/MANIFEST.in         |  2 ++
 ice-server/setup.py            | 23 +++++++----------------
 ice-server/version.py          |  1 +
 validation-scripts/MANIFEST.in |  2 ++
 validation-scripts/setup.py    |  2 +-
 validation-scripts/version.py  |  2 +-
 7 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 ice-server/LICENSE.txt
 create mode 100644 ice-server/MANIFEST.in
 create mode 100644 ice-server/version.py
 create mode 100644 validation-scripts/MANIFEST.in

diff --git a/ice-server/LICENSE.txt b/ice-server/LICENSE.txt
new file mode 100644
index 0000000..dd860ea
--- /dev/null
+++ b/ice-server/LICENSE.txt
@@ -0,0 +1,19 @@
+1.Files ending in .txt, .png, .gif, .jpg, .tiff, .svg, .pdf, .docs, .odf, .xml, or .md in the current directory
+ or subdirectories are licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
+Full license text at https://creativecommons.org/licenses/by/4.0/legalcode.
+
+2.Unless otherwise specified, all other files in the current directory and subdirectories
+ are licensed under Apache 2.0 license.
+-----------------------
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+-------------------------
diff --git a/ice-server/MANIFEST.in b/ice-server/MANIFEST.in
new file mode 100644
index 0000000..c88f159
--- /dev/null
+++ b/ice-server/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE.txt
+include requirements.txt
diff --git a/ice-server/setup.py b/ice-server/setup.py
index eacf048..f8c608f 100644
--- a/ice-server/setup.py
+++ b/ice-server/setup.py
@@ -21,7 +21,7 @@ from setuptools import setup, find_packages
 import sys
 
 if sys.version_info < (3, 0):
-    sys.exit('VNF SDK requires Python 3.0+')
+    sys.exit('VNF SDK ICE server requires Python 3.0+')
 
 root_dir = os.path.dirname(__file__)
 install_requires = []
@@ -44,28 +44,19 @@ with open(os.path.join(root_dir, 'requirements.txt')) as requirements:
         else:
             install_requires.append(requirement)
 
+# read __version__
+exec(open('./version.py').read())
+
 setup(
     name='vnfsdk-ice-server',
-    version='0.1',
-    description='VNF SDK Heat validation tool',
+    version= __version__,
+    description='VNF SDK Heat validation REST server',
     license='Apache License Version 2.0',
     url='http://onap.org/',
 
     packages=find_packages('.'),
-#    packages=[
-#        'heat_test',
-#        'heat_test.ice_validator',
-#        'heat_test.ice_validator.tests',
-#        'heat_test.ice_validator.tests.utils'
-#    ],
 
-package_dir={'heat_test': 'heat_test'},
-#    package_dir={
-#        'heat_test': 'src/heat_test',
-#        'heat_test.ice_validator': 'src/heat_test/ice_validator',
-#        'heat_test.ice_validator.tests': 'src/heat_test/ice_validator/tests',
-#        'heat_test.ice_validator.tests.utils': 'src/heat_test/ice_validator/tests/utils'
-#    },
+    package_dir={'heat_test': 'heat_test'},
 
     include_package_data=True,
     install_requires=install_requires,
diff --git a/ice-server/version.py b/ice-server/version.py
new file mode 100644
index 0000000..1a72d32
--- /dev/null
+++ b/ice-server/version.py
@@ -0,0 +1 @@
+__version__ = '1.1.0'
diff --git a/validation-scripts/MANIFEST.in b/validation-scripts/MANIFEST.in
new file mode 100644
index 0000000..c88f159
--- /dev/null
+++ b/validation-scripts/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE.txt
+include requirements.txt
diff --git a/validation-scripts/setup.py b/validation-scripts/setup.py
index 3023df8..2ce41bf 100644
--- a/validation-scripts/setup.py
+++ b/validation-scripts/setup.py
@@ -21,7 +21,7 @@ from setuptools import setup, find_packages
 import sys
 
 if sys.version_info < (2, 7):
-    sys.exit('VNF SDK requires Python 2.7+')
+    sys.exit('VNF SDK ICE scripts requires Python 2.7+')
 
 root_dir = os.path.dirname(__file__)
 install_requires = []
diff --git a/validation-scripts/version.py b/validation-scripts/version.py
index 1f356cc..1a72d32 100644
--- a/validation-scripts/version.py
+++ b/validation-scripts/version.py
@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = '1.1.0'
-- 
cgit 1.2.3-korg