Merge branch 'master' into netslice

[osm/NBI.git] / setup.py

diff --git a/setup.py b/setup.py
index f4c9f0d..8a293d5 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -6,8 +6,8 @@ from setuptools import setup
 _name = "osm_nbi"
 # version is at first line of osm_nbi/html_public/version
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'osm_nbi/html_public/version')) as version_file:
-    VERSION = version_file.readline().strip()
+# with open(os.path.join(here, 'osm_nbi/html_public/version')) as version_file:
+#     VERSION = version_file.readline().strip()
 with open(os.path.join(here, 'README.rst')) as readme_file:
     README = readme_file.read()
 
@@ -15,7 +15,7 @@ setup(
     name=_name,
     description='OSM North Bound Interface',
     long_description=README,
-    version_command=('git describe --match v* --tags --long --dirty', 'pep440-git'),
+    version_command=('git describe --match v* --tags --long --dirty', 'pep440-git-full'),
     # version=VERSION,
     # python_requires='>3.5.0',
     author='ETSI OSM',
@@ -34,7 +34,7 @@ setup(
         "git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common-0.1.4"
     ],
     install_requires=[
-        'CherryPy', 'pymongo', 'jsonschema', 'PyYAML',
+        'CherryPy', 'pymongo', 'jsonschema', 'PyYAML', 'python-keystoneclient'
         # 'osm-common',
     ],
     setup_requires=['setuptools-version-command'],