From 4d2684848722cb2d469ad4fa60999bf81cf7056e Mon Sep 17 00:00:00 2001
From: Paride Legovini <paride.legovini@canonical.com>
Date: Sat, 2 May 2020 02:57:24 +0200
Subject: Adapt the package building scripts to use Python 3 (#231)

Since upstream cloud-init has dropped python2 support,
adapt remaining package build scripts and tools to python3 only

Changes:

* Do not template debian/rules as python3 is the only supported version
* Drop six from requirements.txt
* Makefile: drop everything related to Python 2
* run-container: install the CI deps only on ubuntu|debian
* read-version: update the shebang to use Python 3
* brpm: read_dependencies(): drop unused argument
* read-dependencies: switch to Py3 and drop the --python-version option
* pkg-deps.json: drop the Python version field and update the redhat deps
* pkg-deps.json: drop the unittest2 and contextlib2 renames
* Update RPM the spec file to use Python 3 when building the RPM
* bddeb: drop support for Python 2
---
 tools/run-container | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tools/run-container')

diff --git a/tools/run-container b/tools/run-container
index a7a552ec..7212550e 100755
--- a/tools/run-container
+++ b/tools/run-container
@@ -463,9 +463,8 @@ main() {
         return
     }
 
-    inside_as_cd "$name" root "$cdir" \
-        python3 ./tools/read-dependencies "--distro=${OS_NAME}" \
-            --test-distro || {
+    local rdcmd=(python3 tools/read-dependencies "--distro=${OS_NAME}" --install --test-distro)
+    inside_as_cd "$name" root "$cdir" "${rdcmd[@]}" || {
         errorrc "FAIL: failed to install dependencies with read-dependencies"
         return
     }
-- 
cgit v1.2.3