Update from master

Squashed commit of the following:

commit 3f3faa30b7341acd221fd580b00418b4684ae85c
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Wed May 10 18:03:23 2023 +0200

    Support of Python3.10 and Ubuntu22

    Change-Id: I700075c1f22bda60f90676c7f8f740a93076e08b
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 845f3213e6c0fa5d7724d8d24de16459a893ee36
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Fri Feb 24 15:34:25 2023 +0100

    Change in tox.ini to use allowlist_externals

    Change-Id: I70a2c9e0090b3f87c474d06d65a947fa55d175a3
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 98b06986d6fa1a2e5142084849f04bf431289c33
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Fri Feb 24 15:30:59 2023 +0100

    Remove unused docker_command.sh script

    Change-Id: Ic4ef4691b35f2856c74a015acd4ee5d5e6295656
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 81316b19d75ee30b677fc445f2f7a6e3bf157a07
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Wed Feb 15 15:57:29 2023 +0100

    Remove unnecessary commands in stage-archive.sh

    Change-Id: I934c37813a7a2e189a1734838e1acdb004d0fe0d
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
    Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit df7452bc42c9ad62f6a0923c0c3eb42a3bc3a331
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date:   Wed Feb 22 15:32:35 2023 +0100

    Fix black errors shown with the latest version of black

    Change-Id: I094b068da11277e07f24e713c4f9f61dbc55f8e5
    Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Change-Id: I1f3278218fd9ae92cee691fb22275e0e61c65f5c
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>

diff --git a/Dockerfile b/Dockerfile
index 026d471..dfd9ff9 100644 (file)
--- 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/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index 92315f6..f4d65db 100755 (executable)
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -1,9 +1,25 @@
 #!/bin/sh
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
 rm -rf pool
 rm -rf dists
 mkdir -p pool/osmclient
 mv deb_dist/*.deb pool/osmclient/
-mkdir -p dists/unstable/osmclient/binary-amd64/
-apt-ftparchive packages pool/osmclient > dists/unstable/osmclient/binary-amd64/Packages
-gzip -9fk dists/unstable/osmclient/binary-amd64/Packages
-echo 'dists/**,pool/osmclient/*.deb'
+# mkdir -p dists/unstable/osmclient/binary-amd64/
+# apt-ftparchive packages pool/osmclient > dists/unstable/osmclient/binary-amd64/Packages
+# gzip -9fk dists/unstable/osmclient/binary-amd64/Packages
+# echo 'dists/**,pool/osmclient/*.deb'

diff --git a/docker_command.sh b/docker_command.sh
deleted file mode 100755 (executable)
index 52e7824..0000000
--- a/docker_command.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#helper routine that creates user/group in docker container
-#necessary when using volumes and inputing -user into docker run
-groupadd -o -g $(id -g) -r $2
-useradd -o -u $(id -u) --create-home -r -g  $2 $1
-shift 2
-exec $@

diff --git a/requirements-dev.txt b/requirements-dev.txt
index f0b7dde..d5aa0f2 100644 (file)
--- 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=paas
     #   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=paas
 pyyaml==5.4.1
     # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
-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=paas
     #   pyangbind

diff --git a/requirements-test.txt b/requirements-test.txt
index fd0128d..295394e 100644 (file)
--- 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 (file)
--- 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 604d3e2..78629d5 100644 (file)
--- 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
@@ -49,7 +49,7 @@ commands =
         coverage report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit=*tests*
-whitelist_externals = sh
+allowlist_externals = sh
 
 
 #######################################################################################
@@ -82,15 +82,15 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==6.6.2
+deps =  pip-tools==6.13.0
 skip_install = true
-whitelist_externals = bash
+allowlist_externals = bash
         [
 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"
@@ -108,7 +108,7 @@ commands =
         python3 setup.py --command-packages=stdeb.command sdist_dsc
         sh -c 'cd deb_dist/osmclient*/ && dpkg-buildpackage -rfakeroot -uc -us'
         sh -c 'rm osmclient/requirements.txt'
-whitelist_externals = sh
+allowlist_externals = sh
 
 #######################################################################################
 [flake8]