openstack: packages: update for python3

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

7 files changed, 67 insertions, 67 deletions

diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb
index c6b3529..8bbbef1 100644
--- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb
+++ b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb
@@ -36,7 +36,7 @@ do_install_append() {
     ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints
 }
 
-inherit setuptools update-rc.d
+inherit setuptools3 update-rc.d
 
 PACKAGES += "${PN}-systemd"
 
@@ -49,5 +49,5 @@ INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${BPN} = "cloud-init"
 
 RDEPENDS_${PN} = "sysklogd \
-                  python \
+                  python3 \
                  "
diff --git a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
index 888bb09..9db4685 100644
--- a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
@@ -12,4 +12,4 @@ SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c
 
 S = "${WORKDIR}/qpid-${PV}/python"
 
-inherit distutils
+inherit distutils3
diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
index b76f76d..933f5ef 100644
--- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://qpid.apache.org/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7ab4c208aa62d92d7a03cc8e0a89c12b"
 SECTION = "mq"
-DEPENDS = "boost perl-native python util-linux cyrus-sasl"
+DEPENDS = "boost perl-native python3 util-linux cyrus-sasl"
 RDEPENDS_${PN} = "cyrus-sasl-bin"
 PR = "r0"
 
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "31b80ba3c4773d288b4e6245e3b2048438386331d460f7a7b0794cbd20
 
 S = "${WORKDIR}/${PN}c-${PV}"
 
-inherit autotools python-dir perlnative cpan-base update-rc.d pkgconfig
+inherit autotools python3-dir perlnative cpan-base update-rc.d pkgconfig
 
 # Env var which tells perl if it should use host (no) or target (yes) settings
 export PERLCONFIGTARGET = "${@is_target(d)}"
diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index c7d1dd0..48a286c 100644
--- a/meta-openstack/recipes-extended/tempest/tempest_git.bb
+++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "tempest"
 
-inherit setuptools identity hosts
+inherit setuptools3 identity hosts
 
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://tempest.conf \
@@ -122,36 +122,36 @@ RDEPENDS_${PN} += " \
         ${SRCNAME}-setup \
         ${SRCNAME}-setup-altdemo \
         ${SRCNAME}-setup-admin \
-        python-mox \
-        python-mock \
-        python-hp3parclient \
-        python-oauth2 \
-        python-testrepository \
-        python-fixtures \
-        python-keyring \
-        python-glanceclient \
-        python-keystoneclient \
-        python-swiftclient \
-        python-novaclient \
-        python-cinderclient \
-        python-heatclient \
-        python-pbr \
-        python-anyjson \
-        python-nose \
-        python-httplib2 \
-        python-jsonschema \
-        python-testtools \
-        python-lxml \
-        python-boto \
-        python-paramiko \
-        python-netaddr \
-        python-testresources \
-        python-oslo.config \
-        python-eventlet \
-        python-six \
-        python-iso8601 \
-        python-mimeparse \
-        python-flake8 \
-        python-tox \
+        python3-mox \
+        python3-mock \
+        python3-hp3parclient \
+        python3-oauth2 \
+        python3-testrepository \
+        python3-fixtures \
+        python3-keyring \
+        python3-glanceclient \
+        python3-keystoneclient \
+        python3-swiftclient \
+        python3-novaclient \
+        python3-cinderclient \
+        python3-heatclient \
+        python3-pbr \
+        python3-anyjson \
+        python3-nose \
+        python3-httplib2 \
+        python3-jsonschema \
+        python3-testtools \
+        python3-lxml \
+        python3-boto \
+        python3-paramiko \
+        python3-netaddr \
+        python3-testresources \
+        python3-oslo.config \
+        python3-eventlet \
+        python3-six \
+        python3-iso8601 \
+        python3-mimeparse \
+        python3-flake8 \
+        python3-tox \
         "
 
diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
index f0c535f..bf6b30f 100644
--- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
+++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
@@ -14,15 +14,15 @@ SRCREV="af44211739136e22471a2897383f34586284bf86"
 PV="2.0.14+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit setuptools pkgconfig
+inherit setuptools3 pkgconfig
 
 # prevent host contamination and remove local search paths
 export UWSGI_REMOVE_INCLUDES = "/usr/include,/usr/local/include"
 
 DEPENDS += " \
         e2fsprogs \
-        python-pip \
-        python-six \
+        python3-pip \
+        python3-six \
         yajl \
         "
 
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index eab28b0..4a1048e 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -20,10 +20,10 @@ SRC_URI = "\
         file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \        
         "
 
-inherit autotools-brokensep distutils-base
+inherit autotools-brokensep distutils3-base
 
-DEPENDS += "apache2-native apache2 python"
-RDEPENDS_${PN} = "python"
+DEPENDS += "apache2-native apache2 python3"
+RDEPENDS_${PN} = "python3"
 
 EXTRA_OECONF = "\
         --with-apxs=${STAGING_BINDIR_CROSS}/apxs \
diff --git a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb
index a4022be..fb75872 100644
--- a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb
+++ b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb
@@ -3,15 +3,15 @@ SECTION = "admin"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fb92f464675f6b5df90f540d60237915"
 DEPENDS = "\
-           python-msgpack \
-           python-pyyaml \
-           python-jinja2 \
-           python-markupsafe \
+           python3-msgpack \
+           python3-pyyaml \
+           python3-jinja2 \
+           python3-markupsafe \
 "
 
 PACKAGECONFIG ??= "zeromq"
-PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto,"
-PACKAGECONFIG[tcp] = ",,python-pycrypto"
+PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto,"
+PACKAGECONFIG[tcp] = ",,python3-pycrypto"
 
 SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \
            file://set_python_location_hashbang.patch \
@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55
 
 S = "${WORKDIR}/${PN}-${PV}"
 
-inherit setuptools update-rc.d
+inherit setuptools3 update-rc.d
 
 # Avoid a QA Warning triggered by the test package including a file
 # with a .a extension
@@ -88,11 +88,11 @@ Between the remote execution system, and state management Salt addresses the bac
 
 SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system"
 DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt."
-RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python-msgpack"
-RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}"
-RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}"
+RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
+RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
+RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
 RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode"
-RSUGGESTS_${PN}-minion = "python-augeas"
+RSUGGESTS_${PN}-minion = "python3-augeas"
 CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion ${sysconfdir}/init.d/${PN}-minion"
 FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy"
 INITSCRIPT_NAME_${PN}-minion = "${PN}-minion"
@@ -101,18 +101,18 @@ INITSCRIPT_PARAMS_${PN}-minion = "defaults"
 SUMMARY_${PN}-common = "shared libraries that salt requires for all packages"
 DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \
 salt-master, salt-minion, and salt-syndic require to function."
-RDEPENDS_${PN}-common = "python-dateutil python-jinja2 python-pyyaml python-requests (>= 1.0.0) python-tornado (>= 4.2.1)"
-RRECOMMENDS_${PN}-common = "lsb python-futures"
-RSUGGESTS_${PN}-common = "python-mako python-git"
-RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)"
+RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-tornado (>= 4.2.1)"
+RRECOMMENDS_${PN}-common = "lsb python3-futures"
+RSUGGESTS_${PN}-common = "python3-mako python3-git"
+RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)"
 CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}-common"
-FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python2.7/ ${CONFFILES_${PN}-common}"
+FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python${PYTHON_BASEVERSION}/ ${CONFFILES_${PN}-common}"
 
 SUMMARY_${PN}-ssh = "remote manager to administer servers via salt"
 DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \
 is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\
  to be installed on the remote host."
-RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python-msgpack"
+RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
 CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster"
 FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}"
 
@@ -123,7 +123,7 @@ even a Websocket API. The Salt API system is used to expose the fundamental aspe
  sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\
  on Read the Docs: http://salt-api.readthedocs.org/"
 RDEPENDS_${PN}-api = "${PN}-master"
-RSUGGESTS_${PN}-api = "python-cherrypy"
+RSUGGESTS_${PN}-api = "python3-cherrypy"
 CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api"
 FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}"
 INITSCRIPT_NAME_${PN}-api = "${PN}-api"
@@ -131,11 +131,11 @@ INITSCRIPT_PARAMS_${PN}-api = "defaults"
 
 SUMMARY_${PN}-master = "remote manager to administer servers via salt"
 DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
-RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python-msgpack"
-RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}"
-RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}"
+RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
+RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
+RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
 CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master  ${sysconfdir}/${PN}/master"
-RSUGGESTS_${PN}-master = "python-git"
+RSUGGESTS_${PN}-master = "python3-git"
 FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master}"
 INITSCRIPT_NAME_${PN}-master = "${PN}-master"
 INITSCRIPT_PARAMS_${PN}-master = "defaults"
@@ -152,13 +152,13 @@ INITSCRIPT_PARAMS_${PN}-syndic = "defaults"
 SUMMARY_${PN}-cloud = "public cloud VM management system"
 DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system."
 RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})"
-RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore"
+RSUGGESTS_${PN}-cloud = "python3-netaddr python3-botocore"
 CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud"
 FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}"
 
 SUMMARY_${PN}-tests = "salt stack test suite"
 DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite."
-RDEPENDS_${PN}-tests = "${PN}-common python-pytest-salt python-tests python-image bash"
+RDEPENDS_${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash"
 FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/"
 
 FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common"