From 3f3faa30b7341acd221fd580b00418b4684ae85c Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 10 May 2023 18:03:23 +0200 Subject: [PATCH] Support of Python3.10 and Ubuntu22 Change-Id: I700075c1f22bda60f90676c7f8f740a93076e08b Signed-off-by: garciadeblas --- Dockerfile | 13 ++++++------- requirements-dev.txt | 4 ++-- requirements-test.txt | 6 +++--- requirements.txt | 12 ++++++------ tox.ini | 6 +++--- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 026d471..dfd9ff9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ # devops-stages/stage-build.sh # -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -34,13 +34,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ debhelper \ dh-python \ git \ - python3.8 \ + python3 \ python3-all \ - python3.8-dev \ - python3-setuptools - -RUN python3 -m easy_install pip==21.3.1 -RUN pip install tox==3.24.5 + python3-dev \ + python3-setuptools \ + python3-pip \ + tox RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \ libcurl4-openssl-dev \ diff --git a/requirements-dev.txt b/requirements-dev.txt index 57022a0..f2e970f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -bitarray==2.6.2 +bitarray==2.7.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master # pyangbind @@ -37,7 +37,7 @@ pyangbind==0.8.1 # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master pyyaml==5.4.1 # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master -regex==2022.10.31 +regex==2023.5.5 # via # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master # pyangbind diff --git a/requirements-test.txt b/requirements-test.txt index fd0128d..295394e 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.1.0 +coverage==7.2.5 # via -r requirements-test.in -mock==5.0.1 +mock==5.0.2 # via -r requirements-test.in -nose2==0.12.0 +nose2==0.13.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 17bbbc5..d326224 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -certifi==2022.12.7 +certifi==2023.5.7 # via requests -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 # via requests click==8.1.3 # via -r requirements.in @@ -26,9 +26,9 @@ jinja2==3.1.2 # via -r requirements.in markupsafe==2.1.2 # via jinja2 -packaging==23.0 +packaging==23.1 # via -r requirements.in -prettytable==3.6.0 +prettytable==3.7.0 # via -r requirements.in pycurl==7.45.2 # via -r requirements.in @@ -36,9 +36,9 @@ python-magic==0.4.27 # via -r requirements.in pyyaml==5.4.1 # via -r requirements.in -requests==2.28.2 +requests==2.30.0 # via -r requirements.in -urllib3==1.26.14 +urllib3==2.0.2 # via requests verboselogs==1.7 # via -r requirements.in diff --git a/tox.ini b/tox.ini index 083b49a..78629d5 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ toxworkdir = /tmp/.tox [testenv] usedevelop = True -basepython = python3.8 +basepython = python3.10 setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE = 1 deps = -r{toxinidir}/requirements.txt @@ -82,7 +82,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash [ @@ -90,7 +90,7 @@ commands = - bash -c "for file in 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" -- 2.25.1