Bug 559 use schema_version 1.1 and encrypt passwds

[osm/NBI.git] / setup.py

diff --git a/setup.py b/setup.py
index 2a206b8..0f3c616 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__))
 _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()
 
 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,
     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',
     # python_requires='>3.5.0',
     author='ETSI OSM',
     author_email='alfonso.tiernosepulveda@telefonica.com',


@@ -27,6 +27,7 @@ setup(
 
     packages=[_name],
     include_package_data=True,
 
     packages=[_name],
     include_package_data=True,

+    # exclude_package_data={'': ['osm_nbi/local', 'temp']},

     data_files=[('/etc/osm/', ['osm_nbi/nbi.cfg']),
                 ('/etc/systemd/system/', ['osm_nbi/osm-nbi.service']),
                 ],
     data_files=[('/etc/osm/', ['osm_nbi/nbi.cfg']),
                 ('/etc/systemd/system/', ['osm_nbi/osm-nbi.service']),
                 ],


@@ -34,10 +35,10 @@ setup(
         "git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common-0.1.4"
     ],
     install_requires=[
         "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',
     ],
         # 'osm-common',
     ],

-    # setup_requires=['setuptools-version-command'],
+    setup_requires=['setuptools-version-command'],

     # test_suite='nose.collector',
     # entry_points='''
     #     [console_scripts]
     # test_suite='nose.collector',
     # entry_points='''
     #     [console_scripts]