Added a default topology that is automatically called in dockerized deployments if...

[osm/vim-emu.git] / setup.py

diff --git a/setup.py b/setup.py
index 7e00fff..fd36cf3 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 """
 """

-Copyright (c) 2015 SONATA-NFV
+Copyright (c) 2015 SONATA-NFV and Paderborn University

 ALL RIGHTS RESERVED.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 ALL RIGHTS RESERVED.
 
 Licensed under the Apache License, Version 2.0 (the "License");


@@ -14,7 +14,7 @@ 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.
 
 See the License for the specific language governing permissions and
 limitations under the License.
 

-Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+Neither the name of the SONATA-NFV, Paderborn University

 nor the names of its contributors may be used to endorse or promote
 products derived from this software without specific prior written
 permission.
 nor the names of its contributors may be used to endorse or promote
 products derived from this software without specific prior written
 permission.


@@ -28,7 +28,7 @@ partner consortium (www.sonata-nfv.eu).
 from setuptools import setup, find_packages
 
 setup(name='emuvim',
 from setuptools import setup, find_packages
 
 setup(name='emuvim',

-      version='0.9',
+      version='1.0',

       license='Apache 2.0',
       description='emuvim is a VIM for the SONATA platform',
       url='http://github.com/sonata-emu',
       license='Apache 2.0',
       description='emuvim is a VIM for the SONATA platform',
       url='http://github.com/sonata-emu',


@@ -37,9 +37,9 @@ setup(name='emuvim',
       # packages=find_packages('emuvim', exclude=['*.test', '*.test.*', 'test.*', 'test']),
       packages=find_packages('src'),
       include_package_data=True,
       # packages=find_packages('emuvim', exclude=['*.test', '*.test.*', 'test.*', 'test']),
       packages=find_packages('src'),
       include_package_data=True,

-      package_data= {
+      package_data={

               'emuvim.api.sonata': ['*.yml'],
               'emuvim.api.sonata': ['*.yml'],

-              'emuvim.dashboard' : ['*.html', 'css/*.css','img/*','js/*.js']
+              'emuvim.dashboard': ['*.html', 'css/*.css', 'img/*', 'js/*.js']

       },
       install_requires=[
           'pyaml',
       },
       install_requires=[
           'pyaml',


@@ -54,10 +54,11 @@ setup(name='emuvim',
           'Flask',
           'flask_restful',
           'docker==2.0.2',
           'Flask',
           'flask_restful',
           'docker==2.0.2',

+          'urllib3==1.21.1',

           'requests',
           'prometheus_client',
           'requests',
           'prometheus_client',

-          'urllib3',
-          'ipaddress'
+          'ipaddress',
+          'simplejson'

       ],
       zip_safe=False,
       entry_points={
       ],
       zip_safe=False,
       entry_points={


@@ -67,4 +68,4 @@ setup(name='emuvim',
       },
       setup_requires=['pytest-runner'],
       tests_require=['pytest'],
       },
       setup_requires=['pytest-runner'],
       tests_require=['pytest'],

-)
+      )