Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemed

to be behind trunk.

`tox -e py27` passes full test suite.  Now to work on replacing mocker.

2 files changed, 3 insertions, 0 deletions

diff --git a/packages/bddeb b/packages/bddeb
index 9d264f92..83ca68bb 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -38,6 +38,7 @@ PKG_MP = {
     'pyserial': 'python-serial',
     'pyyaml': 'python-yaml',
     'requests': 'python-requests',
+    'six': 'python-six',
 }
 DEBUILD_ARGS = ["-S", "-d"]
 
diff --git a/packages/brpm b/packages/brpm
index 9657b1dd..72bfca08 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -45,6 +45,7 @@ PKG_MP = {
         'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
         'requests': 'python-requests',
+        'six': 'python-six',
     },
     'suse': {
         'argparse': 'python-argparse',
@@ -56,6 +57,7 @@ PKG_MP = {
         'pyserial': 'python-pyserial',
         'pyyaml': 'python-yaml',
         'requests': 'python-requests',
+        'six': 'python-six',
     }
 }