From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 23 Mar 2023 12:25:27 +0000 (+0100)
Subject: Support of Python3.10
X-Git-Tag: release-v14.0-start~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F13083%2F6;p=osm%2FNG-SA.git

Support of Python3.10

Change-Id: I1e4cea9de08806142ad552420aec1afec268d66e
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/Dockerfile b/Dockerfile
index db2155d..7784d7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@
 #   devops-stages/stage-build.sh
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG APT_PROXY
 RUN if [ ! -z $APT_PROXY ] ; then \
@@ -39,8 +39,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
         python3 \
         python3-all \
         python3-dev \
-        python3-setuptools
+        python3-setuptools \
+        python3-pip \
+        tox
 
-RUN python3 -m easy_install pip==22.3
-RUN pip install tox==3.24.5
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
 
diff --git a/requirements-dist.in b/requirements-dist.in
index 7929c6f..03ff6e9 100644
--- a/requirements-dist.in
+++ b/requirements-dist.in
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-packaging==23.0
 stdeb
 setuptools-scm
 setuptools<60
diff --git a/requirements-dist.txt b/requirements-dist.txt
index 48f399b..6b66483 100644
--- a/requirements-dist.txt
+++ b/requirements-dist.txt
@@ -14,10 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #######################################################################################
-packaging==23.0
-    # via
-    #   -r requirements-dist.in
-    #   setuptools-scm
+packaging==23.1
+    # via setuptools-scm
 setuptools-scm==7.1.0
     # via -r requirements-dist.in
 stdeb==0.10.0
diff --git a/requirements.in b/requirements.in
index 58bbbd4..e333d35 100644
--- a/requirements.in
+++ b/requirements.in
@@ -21,7 +21,6 @@ azure-mgmt-compute
 gnocchiclient
 google-api-python-client
 google-auth
-packaging==23.0
 prometheus-api-client
 prometheus-client
 python-ceilometerclient
diff --git a/requirements.txt b/requirements.txt
index 8895b22..a82d60c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -159,9 +159,8 @@ oslo-utils==6.1.0
     #   python-ceilometerclient
     #   python-keystoneclient
     #   python-novaclient
-packaging==23.0
+packaging==23.1
     # via
-    #   -r requirements.in
     #   matplotlib
     #   oslo-utils
     #   python-keystoneclient
diff --git a/tox.ini b/tox.ini
index 36637f8..39d19f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ setenv = XDG_CACHE_HOME=/tmp/.cache
 
 [testenv]
 usedevelop = True
-basepython = python3
+basepython = python3.10
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
 deps =  -r{toxinidir}/requirements.txt
@@ -108,7 +108,7 @@ commands =
         bash -c "for file in osm_webhook_translator/requirements*.in ; do \
         UNSAFE="" ; \
         if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
-        pip-compile -rU --no-header $UNSAFE $file ;\
+        pip-compile --resolver=backtracking -rU --no-header $UNSAFE $file ;\
         out=`echo $file | sed 's/.in/.txt/'` ; \
         sed -i -e '1 e head -16 tox.ini' $out ;\
         done"