X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=setup.py;h=8a293d54f234b1bf47ce01c58dc47b79f9d79102;hp=2a206b8c9a30010941dca987187b1b8b196a4646;hb=07f3172ef24dab2c7c47c9a8e726f1f9876f13b3;hpb=2236d203182b39ae5d20d21a475c95f6a5d5fbc5;ds=sidebyside

diff --git a/setup.py b/setup.py
index 2a206b8..8a293d5 100644
--- 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,8 +15,8 @@ setup(
     name=_name,
     description='OSM North Bound Interface',
     long_description=README,
-    # version_command=('git describe --tags --long --dirty', 'pep440-git'),
-    version=VERSION,
+    version_command=('git describe --match v* --tags --long --dirty', 'pep440-git-full'),
+    # version=VERSION,
     # python_requires='>3.5.0',
     author='ETSI OSM',
     author_email='alfonso.tiernosepulveda@telefonica.com',
@@ -34,10 +34,10 @@ 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'],
+    setup_requires=['setuptools-version-command'],
     # test_suite='nose.collector',
     # entry_points='''
     #     [console_scripts]