Merge "Update python packages content and version"

4 files changed, 29 insertions, 16 deletions

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'