From: tierno Date: Wed, 28 Oct 2020 10:04:37 +0000 (+0000) Subject: fix 1272. Fixing aiohttp version to 3.6.2 X-Git-Tag: release-v9.0-start~15 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=commitdiff_plain;h=f3ea2ed8d6932d3709e15a8f69a34f57405bb740;hp=4ab6b3f55e1d3da31b008830151821d5a88b83c6;ds=sidebyside 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 --- diff --git a/requirements.txt b/requirements.txt index 1f2adf9..6abb721 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,11 +10,11 @@ # 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 -aiohttp>=2.3.10 +aiohttp>=2.3.10,<=3.6.2 diff --git a/setup.py b/setup.py index f134876..309dda1 100644 --- a/setup.py +++ b/setup.py @@ -48,14 +48,14 @@ setup( # ('/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', - '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', - 'aiohttp>=2.3.10', + 'aiohttp>=2.3.10,<=3.6.2', ], setup_requires=['setuptools-version-command'], )