X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=setup.py;h=23bb860c312cd4603a58821723467484272f946d;hp=a28df099ee005f7933987b9647c8dd168901fc38;hb=8489b0ca69a19715ddbbb9ef0bfe804eee439a96;hpb=0911b55bc91d71dfac1788346a51311b3943d315

diff --git a/setup.py b/setup.py
index a28df09..23bb860 100755
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,32 @@
-"""
-Copyright (c) 2015 SONATA-NFV and Paderborn University
-ALL RIGHTS RESERVED.
-
-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.
-
-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.
-
-This work has been performed in the framework of the SONATA project,
-funded by the European Commission under Grant number 671517 through
-the Horizon 2020 and 5G-PPP programmes. The authors would like to
-acknowledge the contributions of their colleagues of the SONATA
-partner consortium (www.sonata-nfv.eu).
-"""
+# Copyright (c) 2015 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+#
+# 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.
+#
+# 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.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
 from setuptools import setup, find_packages
 
 setup(name='emuvim',
-      version='1.0',
+      version='6.0',
       license='Apache 2.0',
       description='vim-emu: A NFV multi-PoP emulation platform',
       url='https://osm.etsi.org/gitweb/?p=osm/vim-emu.git',
@@ -49,15 +47,21 @@ setup(name='emuvim',
           'six>=1.9',
           'ryu',
           'oslo.config',
-          'pytest',
+          'pytest<=4.6.4',
           'Flask',
           'flask_restful',
           'docker==2.0.2',
-          'urllib3==1.21.1',
+          'urllib3',
           'requests',
           'prometheus_client',
           'ipaddress',
-          'simplejson'
+          'simplejson',
+          'gevent',
+          'flake8',
+          # fixes: https://github.com/pytest-dev/pytest/issues/4770
+          'more-itertools<=5.0.0',
+          'jinja2',
+          'psutil'
       ],
       zip_safe=False,
       entry_points={
@@ -66,5 +70,5 @@ setup(name='emuvim',
           ],
       },
       setup_requires=['pytest-runner'],
-      tests_require=['pytest'],
+      tests_require=['pytest<=4.6.4', 'more-itertools<=5.0.0'],
       )