From d87dee3a5792b3528596abd068649a7205a1a355 Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Fri, 23 Sep 2022 23:47:17 +0000 Subject: [PATCH] [DCAEMOD/Distributor] Fix app startup error Remove py3.10 from tox Change-Id: I0021948a3ce0380a00421c73b66ed7898a6c3952 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-3271 Signed-off-by: Vijay Venkatesh Kumar --- mod/distributorapi/Changelog.md | 4 +++- mod/distributorapi/Dockerfile | 4 ++-- mod/distributorapi/tox.ini | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mod/distributorapi/Changelog.md b/mod/distributorapi/Changelog.md index 5b4f623..fc1ec2e 100644 --- a/mod/distributorapi/Changelog.md +++ b/mod/distributorapi/Changelog.md @@ -4,11 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [1.1.1] - 2022/08/05 +## [1.1.1] - 2022/09/23 * DCAEGEN2-3170 - CodeCoverage improvement for dcaegen2-platform-mod-distributorapi * fix value of MarkupSafe to 2.0.1 because jango+jinja uses a slightly older API * run black on mod/distributorapi + * DCAEGEN2-3271 - Switch to 9.1.0 base image which used python 3.9 + ## [1.1.0] - 2020/08/19 * DCAEGEN2-2292 - ONAP must complete update of the Python language (from 2.7 -> 3.8) diff --git a/mod/distributorapi/Dockerfile b/mod/distributorapi/Dockerfile index 84ee6b5..29fbfb3 100644 --- a/mod/distributorapi/Dockerfile +++ b/mod/distributorapi/Dockerfile @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019,2022 AT&T Intellectual Property. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -FROM nexus3.onap.org:10001/onap/integration-python:latest +FROM nexus3.onap.org:10001/onap/integration-python:9.1.0 COPY --chown=onap:onap . /app RUN pip install . diff --git a/mod/distributorapi/tox.ini b/mod/distributorapi/tox.ini index 3370210..73721d1 100644 --- a/mod/distributorapi/tox.ini +++ b/mod/distributorapi/tox.ini @@ -15,7 +15,7 @@ # ============LICENSE_END========================================================= [tox] -envlist = py38,py39,py310 +envlist = py38,py39 skip_missing_interpreters = true [testenv] -- 2.16.6