From c8890f7f4dfaca51762e04b24999ab0ef1a1c72e Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Sun, 17 Dec 2023 15:30:50 +0000 Subject: [PATCH] Fix Flask version in Enhanced Catalogue Change-Id: I590f5fa947d8e41056db46b08e75df6e8ba75f55 issue-ID: NONRTRIC-958 Signed-off-by: JohnKeeney --- catalogue-enhanced/Dockerfile | 7 ++----- catalogue-enhanced/setup.py | 5 ++--- catalogue-enhanced/src/main.py | 1 + catalogue-enhanced/tox.ini | 6 +++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/catalogue-enhanced/Dockerfile b/catalogue-enhanced/Dockerfile index db33be5..9939ebf 100644 --- a/catalogue-enhanced/Dockerfile +++ b/catalogue-enhanced/Dockerfile @@ -15,12 +15,9 @@ # ============LICENSE_END================================================= # -FROM python:3.8-slim-buster - -RUN pip install connexion[swagger-ui] - -#install nginx and curl +FROM python:3.10-slim-buster RUN apt-get update && apt-get install -y nginx=1.14.* nginx-extras curl +RUN pip install Flask==2.2.5 connexion[swagger-ui,flask]==2.14.2 WORKDIR /usr/src/app diff --git a/catalogue-enhanced/setup.py b/catalogue-enhanced/setup.py index 0c82586..6f92040 100644 --- a/catalogue-enhanced/setup.py +++ b/catalogue-enhanced/setup.py @@ -2,6 +2,7 @@ # ============LICENSE_START=============================================== # Copyright (C) 2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023 OpenInfra Foundation Europe. 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. @@ -20,10 +21,8 @@ from setuptools import setup setup(name='rappcatalogue-enhanced', - version='1.0.0', + version='1.1.0', description='The O-RAN Non-RT RIC rApp Catalogue Enhanced provides an OpenApi 3.0 REST API for rApp services to register/unregister themselves and discover other services', - maintainer='Halil Cakal', - maintainer_email='halil.cakal@est.tech', url='https://gerrit.o-ran-sc.org/r/admin/repos/nonrtric/plt/rappcatalogue,general', license='Apache License, Version 2.0', platforms='any', diff --git a/catalogue-enhanced/src/main.py b/catalogue-enhanced/src/main.py index 5dda795..0f504be 100644 --- a/catalogue-enhanced/src/main.py +++ b/catalogue-enhanced/src/main.py @@ -1,5 +1,6 @@ # ============LICENSE_START=============================================== # Copyright (C) 2022-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023 OpenInfra Foundation Europe. 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. diff --git a/catalogue-enhanced/tox.ini b/catalogue-enhanced/tox.ini index e21b9b5..094c5f0 100644 --- a/catalogue-enhanced/tox.ini +++ b/catalogue-enhanced/tox.ini @@ -17,7 +17,7 @@ [tox] envlist = code -minversion = 2.0 +minversion = 4.0 skipsdist = true # basic test and coverage job @@ -27,8 +27,8 @@ deps= pytest coverage pytest-cov - connexion - + connexion==2.14.2 + Flask==2.2.5 setenv = TESTS_BASE_PATH = {toxinidir}/tests commands = pytest --cov-append --cov {toxinidir} --cov-report xml --cov-report term-missing --cov-report html -- 2.16.6