commit 8348393fab54da94964cd1069ab126e5d555ab07
author beierlm <mark.beierl@canonical.com> Thu Jan 13 13:21:53 2022 -0500
committer beierlm <mark.beierl@canonical.com> Tue Jan 18 15:59:16 2022 +0100
tree 39b8201028e76ae7be5588801792e4e491df2a4d
parent e9a26f282aa9a82e19484514c69b18b381594ab4

Bug 1849: 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 1849

Change-Id: I8a589bbc76bb11f4bc0c42ebb727729da5c5c906
Signed-off-by: beierlm <mark.beierl@canonical.com>

tox.ini

diff --git a/tox.ini b/tox.ini
index 699ff96..c650490 100644
--- a/tox.ini
+++ b/tox.ini
@@ -199,15 +199,19 @@
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==5.5.0
+deps =  pip-tools==6.4.0
 skip_install = true
-whitelist_externals = sh
+whitelist_externals = bash
+        [
 commands =
-        - sh -c "for file in requirements*.in ; do pip-compile -rU --no-header $file ;\
+        - 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"
-        - sh -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt"
+        - bash -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt"
 
 
 #######################################################################################