fix 1272. Fixing aiohttp version to 3.6.2

library aioresponses 0.7.0 used only by unittests is failing
with the aiohttp version 3.7.x For the moment freezing aiohttp
version

Also allows modern versions of cherrypy and jsonschema in master branch

Change-Id: I45503fd28a2f015773b1f7200d80d5ce412df567
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/requirements.txt b/requirements.txt
index 1f2adf9..6abb721 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,11 +10,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
 # License for the specific language governing permissions and limitations
 # under the License.
 

-CherryPy==18.1.2
-jsonschema==3.2.0
+CherryPy>=18.1.2
+jsonschema>=3.2.0

 PyYAML
 python-keystoneclient
 requests
 git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
 git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im
 PyYAML
 python-keystoneclient
 requests
 git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common
 git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im

-aiohttp>=2.3.10
+aiohttp>=2.3.10,<=3.6.2

diff --git a/setup.py b/setup.py
index f134876..309dda1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -48,14 +48,14 @@ setup(
     #             ('/etc/systemd/system/', ['osm_nbi/osm-nbi.service']),
     #             ],
     install_requires=[
     #             ('/etc/systemd/system/', ['osm_nbi/osm-nbi.service']),
     #             ],
     install_requires=[

-        'CherryPy==18.1.2',
+        'CherryPy>=18.1.2',

         'osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common',
         'osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common',

-        'jsonschema==3.2.0',
+        'jsonschema>=3.2.0',

         'PyYAML',
         'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im',
         'python-keystoneclient',
         'requests',
         'PyYAML',
         'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im',
         'python-keystoneclient',
         'requests',

-        'aiohttp>=2.3.10',
+        'aiohttp>=2.3.10,<=3.6.2',

     ],
     setup_requires=['setuptools-version-command'],
 )
     ],
     setup_requires=['setuptools-version-command'],
 )