From 6c35c5413e88c284cd21ace341b42a62210dd175 Mon Sep 17 00:00:00 2001 From: beierlm Date: Thu, 13 Jan 2022 13:12:46 -0500 Subject: [PATCH] Bug 1847: 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 1847 Change-Id: Icbe9e9efc0edd957a4b8c0c461cf9d32c716df3e Signed-off-by: beierlm --- Dockerfile | 13 ++++++++++--- requirements-dev.txt | 32 ++++++++++++++++---------------- requirements-dist.in | 3 ++- requirements-dist.txt | 17 ++++++++++------- requirements-test.txt | 20 ++++++++++---------- requirements.in | 2 +- requirements.txt | 16 ++++++++-------- tox.ini | 19 ++++++++++++------- 8 files changed, 69 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6b2f78..7470d52 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-all \ python3-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 ADD https://github.com/MiniZinc/MiniZincIDE/releases/download/2.4.2/MiniZincIDE-2.4.2-bundle-linux-x86_64.tgz /minizinc.tgz diff --git a/requirements-dev.txt b/requirements-dev.txt index d298adb..b1bd068 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,19 +1,3 @@ -aiokafka==0.7.0 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 -dataclasses==0.6 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 -kafka-python==2.0.2 - # via - # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 - # aiokafka -git+https://osm.etsi.org/gerrit/osm/common.git@v10.0#egg=osm-common - # via -r requirements-dev.in -pycrypto==2.6.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 -pymongo==3.11.3 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 -pyyaml==5.4.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 ####################################################################################### # Copyright ETSI Contributors and Others. # @@ -30,3 +14,19 @@ pyyaml==5.4.1 # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### +aiokafka==0.7.2 + # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 +dataclasses==0.6 + # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 +kafka-python==2.0.2 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 + # aiokafka +osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master + # via -r requirements-dev.in +pycrypto==2.6.1 + # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 +pymongo==3.12.3 + # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 +pyyaml==5.4.1 + # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v10.0 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 d0c984f..7589d84 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,13 +1,3 @@ -coverage==5.5 - # via - # -r requirements-test.in - # nose2 -mock==4.0.3 - # via -r requirements-test.in -nose2==0.10.0 - # via -r requirements-test.in -six==1.15.0 - # via nose2 ####################################################################################### # Copyright ETSI Contributors and Others. # @@ -24,3 +14,13 @@ 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 +mock==4.0.3 + # via -r requirements-test.in +nose2==0.10.0 + # via -r requirements-test.in +six==1.16.0 + # via nose2 diff --git a/requirements.in b/requirements.in index 82788ed..e76dad1 100755 --- a/requirements.in +++ b/requirements.in @@ -15,6 +15,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -pyyaml +pyyaml==5.4.1 pymzn==0.18.* jinja2 diff --git a/requirements.txt b/requirements.txt index 6f8103b..8b8b3fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,3 @@ -jinja2==2.11.3 - # via -r requirements.in -markupsafe==1.1.1 - # via jinja2 -pymzn==0.18.3 - # via -r requirements.in -pyyaml==5.4.1 - # via -r requirements.in ####################################################################################### # Copyright ETSI Contributors and Others. # @@ -22,3 +14,11 @@ pyyaml==5.4.1 # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### +jinja2==3.0.3 + # via -r requirements.in +markupsafe==2.0.1 + # via jinja2 +pymzn==0.18.3 + # via -r requirements.in +pyyaml==5.4.1 + # via -r requirements.in diff --git a/tox.ini b/tox.ini index d244554..d4f93f1 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 deps = -r{toxinidir}/requirements.txt @@ -81,13 +81,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