From d3b8c07e7f95f6d434ce55a3d8c3518b316ac08f Mon Sep 17 00:00:00 2001 From: beierlm Date: Thu, 13 Jan 2022 11:39:43 -0500 Subject: [PATCH] Bug 1844: LTS Support Updates base to Ubuntu 20.04 Updates python to 3.8 Updates pip dependencies to more recent versions Adds apt cache to stage 2 dockerfile Fixes bug 1844 Change-Id: Iccea9a5121fa8e701ae18c64d71d094ee7c535c7 Signed-off-by: beierlm --- Dockerfile | 17 ++++++++++++----- requirements-dist.in | 3 ++- requirements-dist.txt | 17 ++++++++++------- requirements-test.txt | 16 ++++++++-------- requirements.in | 2 +- requirements.txt | 40 ++++++++++++++++++++-------------------- tox.ini | 19 ++++++++++++------- 7 files changed, 65 insertions(+), 49 deletions(-) diff --git a/Dockerfile b/Dockerfile index c811fb7..e9f5ee1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,19 +21,26 @@ # devops-stages/stage-build.sh # -FROM ubuntu:18.04 +FROM ubuntu:20.04 + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install \ debhelper \ + dh-python \ git \ - python3 \ + python3.8 \ python3-all \ - python3-dev \ + python3.8-dev \ python3-setuptools -RUN python3 -m easy_install pip==21.0.1 -RUN pip3 install tox==3.22.0 +RUN python3 -m easy_install pip==21.3.1 +RUN pip install tox==3.24.5 RUN DEBIAN_FRONTEND=noninteractive apt -y install wget build-essential dh-make \ openjdk-8-jdk maven diff --git a/requirements-dist.in b/requirements-dist.in index 11f0a2a..4f8784f 100644 --- a/requirements-dist.in +++ b/requirements-dist.in @@ -14,4 +14,5 @@ # limitations under the License. stdeb -setuptools-version-command \ No newline at end of file +setuptools-version-command +setuptools<60 \ No newline at end of file diff --git a/requirements-dist.txt b/requirements-dist.txt index 7393626..8192b48 100644 --- a/requirements-dist.txt +++ b/requirements-dist.txt @@ -1,10 +1,3 @@ -setuptools-version-command==2.2 - # via -r requirements-dist.in -stdeb==0.10.0 - # via -r requirements-dist.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools ####################################################################################### # Copyright ETSI Contributors and Others. # @@ -21,3 +14,13 @@ stdeb==0.10.0 # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### +setuptools-version-command==99.9 + # via -r requirements-dist.in +stdeb==0.10.0 + # via -r requirements-dist.in + +# The following packages are considered to be unsafe in a requirements file: +setuptools==59.8.0 + # via + # -r requirements-dist.in + # setuptools-version-command diff --git a/requirements-test.txt b/requirements-test.txt index decfef2..e355475 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,11 +1,3 @@ -coverage==5.5 - # via - # -r requirements-test.in - # nose2 -nose2==0.10.0 - # via -r requirements-test.in -six==1.15.0 - # via nose2 ####################################################################################### # Copyright ETSI Contributors and Others. # @@ -22,3 +14,11 @@ six==1.15.0 # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### +coverage==6.2 + # via + # -r requirements-test.in + # nose2 +nose2==0.10.0 + # via -r requirements-test.in +six==1.16.0 + # via nose2 diff --git a/requirements.in b/requirements.in index 24f4c58..94c2eb9 100644 --- a/requirements.in +++ b/requirements.in @@ -15,4 +15,4 @@ pyang pyangbind -pyyaml \ No newline at end of file +pyyaml==5.4.1 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 002200e..2901c33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,3 @@ -bitarray==1.8.1 - # via pyangbind -enum34==1.1.10 - # via pyangbind -lxml==4.6.3 - # via - # pyang - # pyangbind -pyang==2.4.0 - # via - # -r requirements.in - # pyangbind -pyangbind==0.8.1 - # via -r requirements.in -pyyaml==5.4.1 - # via -r requirements.in -regex==2021.3.17 - # via pyangbind -six==1.15.0 - # via pyangbind ####################################################################################### # Copyright ETSI Contributors and Others. # @@ -34,3 +14,23 @@ six==1.15.0 # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### +bitarray==2.3.5 + # via pyangbind +enum34==1.1.10 + # via pyangbind +lxml==4.7.1 + # via + # pyang + # pyangbind +pyang==2.5.2 + # via + # -r requirements.in + # pyangbind +pyangbind==0.8.1 + # via -r requirements.in +pyyaml==5.4.1 + # via -r requirements.in +regex==2021.11.10 + # via pyangbind +six==1.16.0 + # via pyangbind diff --git a/tox.ini b/tox.ini index 54128a0..f1cf7c9 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ toxworkdir = /tmp/.tox [testenv] usedevelop = True -basepython = python3 +basepython = python3.8 setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE = 1 passenv = HOME @@ -76,13 +76,18 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==5.5.0 +deps = pip-tools==6.4.0 +skip_install = true +whitelist_externals = bash + [ commands = - - sh -c 'for file in requirements*.in ; do pip-compile -rU --no-header $file ;\ - out=`echo $file | sed "s/.in/.txt/"` ; \ - head -16 tox.ini >> $out ;\ - done' -whitelist_externals = sh + - bash -c "for file in requirements*.in ; do \ + UNSAFE="" ; \ + if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \ + pip-compile -rU --no-header $UNSAFE $file ;\ + out=`echo $file | sed 's/.in/.txt/'` ; \ + sed -i -e '1 e head -16 tox.ini' $out ;\ + done" ####################################################################################### -- 2.17.1