diff options
241 files changed, 187 insertions, 368 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb index 4cf2ae54..bb422987 100644 --- a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb +++ b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb @@ -11,7 +11,7 @@ SRC_URI += " \ SRC_URI[md5sum] = "678ea30265ae0326bddc767f80efd144" SRC_URI[sha256sum] = "fe78c2b227ce077b1581e2ae2c071f351111d0878ec1b0216435f6a898df79a6" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-amqp_2.4.1.bb b/meta-openstack/recipes-devtools/python/python-amqp_2.4.1.bb deleted file mode 100644 index 9d520629..00000000 --- a/meta-openstack/recipes-devtools/python/python-amqp_2.4.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-amqp.inc diff --git a/meta-openstack/recipes-devtools/python/python-amqplib_1.0.2.bb b/meta-openstack/recipes-devtools/python/python-amqplib_1.0.2.bb deleted file mode 100644 index a39284af..00000000 --- a/meta-openstack/recipes-devtools/python/python-amqplib_1.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-amqplib.inc diff --git a/meta-openstack/recipes-devtools/python/python-arrow_0.15.2.bb b/meta-openstack/recipes-devtools/python/python-arrow_0.15.2.bb deleted file mode 100644 index e5deaade..00000000 --- a/meta-openstack/recipes-devtools/python/python-arrow_0.15.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-arrow.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb b/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb index c7e4dda4..3cfd3fd3 100644 --- a/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb +++ b/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" SRC_URI[md5sum] = "230a7bd8bb9a4bc9ba5a3faf0de12c90" SRC_URI[sha256sum] = "ca8bfbea03b9f39a536b4b261d90fbe8b1b0e1766bff5d8222e35691f8e11910" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-avahi.inc b/meta-openstack/recipes-devtools/python/python-avahi.inc index 86cafe50..c2359596 100644 --- a/meta-openstack/recipes-devtools/python/python-avahi.inc +++ b/meta-openstack/recipes-devtools/python/python-avahi.inc @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc S = "${WORKDIR}/avahi-${PV}" -inherit pythonnative +inherit python3native # we only need the python bindings do_install () { diff --git a/meta-openstack/recipes-devtools/python/python-avahi_0.6.32.bb b/meta-openstack/recipes-devtools/python/python-avahi_0.6.32.bb deleted file mode 100644 index 7a54211d..00000000 --- a/meta-openstack/recipes-devtools/python/python-avahi_0.6.32.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-avahi.inc - -inherit python-dir - -RDEPENDS_${PN} += "python-core python-dbus" diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 579413c0..71cf4c33 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb @@ -19,7 +19,7 @@ SRCREV = "e6f05febbe18a86e4e6b05acc5f4868fa3beb291" PV = "2015.1.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit update-rc.d setuptools identity hosts useradd default_configs monitor +inherit update-rc.d setuptools3 identity hosts useradd default_configs monitor SERVICECREATE_PACKAGES = "${SRCNAME}-setup" KEYSTONE_HOST="${CONTROLLER_IP}" diff --git a/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb index a4bcdea0..289495af 100644 --- a/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb @@ -12,7 +12,7 @@ PV = "4.9.0+git${SRCPV}" SRCREV = "9c0e02d367b86eb5bdebda4e0ff1434d70db5f61" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-boto_git.bb b/meta-openstack/recipes-devtools/python/python-boto_git.bb index 560b0863..77e2043c 100644 --- a/meta-openstack/recipes-devtools/python/python-boto_git.bb +++ b/meta-openstack/recipes-devtools/python/python-boto_git.bb @@ -16,5 +16,5 @@ SRC_URI[sha256sum] = "4d6d38aa8e9e536a27a9737eb4222f896417841fed9a12eedcb619ba8f S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-castellan_git.bb b/meta-openstack/recipes-devtools/python/python-castellan_git.bb index 9401ad9c..a0017af3 100644 --- a/meta-openstack/recipes-devtools/python/python-castellan_git.bb +++ b/meta-openstack/recipes-devtools/python/python-castellan_git.bb @@ -14,7 +14,7 @@ PV="0.12.1+git${SRCPV}" SRCREV="124e9296fe79412b510c73b35936a6be91267d18" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 4b01022e..90cfe1ef 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -122,7 +122,7 @@ pkg_postinst_${SRCNAME}-setup () { fi } -inherit setuptools identity hosts update-rc.d default_configs monitor +inherit setuptools3 identity hosts update-rc.d default_configs monitor PACKAGES += " ${SRCNAME}-tests" PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api" @@ -199,7 +199,7 @@ RDEPENDS_${PN} += " \ python-paramiko \ python-babel \ python-iso8601 \ - python-setuptools-git \ + python-setuptools3-git \ python-glanceclient \ python-keystoneclient \ python-swiftclient \ diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb index 268e6a7d..5e5e43e2 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb @@ -36,7 +36,7 @@ PV = "2.9.1" SRCREV = "4ee321feeef39fa2a297ad8e58e931b8a03d8f14" S = "${WORKDIR}/git" -inherit setuptools rmargparse +inherit setuptools3 rmargparse PACKAGECONFIG ?= "bash-completion" diff --git a/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb b/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb deleted file mode 100644 index b3d7ca73..00000000 --- a/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-cephclient.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 5274698b..29d35940 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -25,7 +25,7 @@ SRCREV = "4fb3a702ba8c3de24c41a6f706597bfa81e60435" PV = "11.1.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools systemd useradd identity default_configs hosts monitor +inherit setuptools3 systemd useradd identity default_configs hosts monitor USER = "cinder" GROUP = "cinder" diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb index 920858ab..bacb25f9 100644 --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/openstack/python-cinderclient" SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3572962e13e5e739b30b0864365e0795" -DEPENDS = "python-setuptools-git" +DEPENDS = "python-setuptools3-git" SRCNAME = "python-cinderclient" @@ -16,7 +16,7 @@ PV="3.1.0+git${SRCPV}" SRCREV="3640aeab6e11987288a2f149fbeedb1c026045e2" S = "${WORKDIR}/git" -inherit setuptools monitor +inherit setuptools3 monitor DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-cliff_2.17.0.bb b/meta-openstack/recipes-devtools/python/python-cliff_2.17.0.bb deleted file mode 100644 index 6fadd5bd..00000000 --- a/meta-openstack/recipes-devtools/python/python-cliff_2.17.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -inherit setuptools -require python-cliff.inc - -# RDEPENDS only fot python2 -RDEPENDS_${PN} += " \ - python-unicodecsv \ -" diff --git a/meta-openstack/recipes-devtools/python/python-colorama_0.4.1.bb b/meta-openstack/recipes-devtools/python/python-colorama_0.4.1.bb deleted file mode 100644 index 097193fc..00000000 --- a/meta-openstack/recipes-devtools/python/python-colorama_0.4.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require python-colorama.inc -inherit setuptools - diff --git a/meta-openstack/recipes-devtools/python/python-coverage_4.0a5.bb b/meta-openstack/recipes-devtools/python/python-coverage_4.0a5.bb deleted file mode 100644 index 0ddc356b..00000000 --- a/meta-openstack/recipes-devtools/python/python-coverage_4.0a5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-coverage.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-croniter_0.3.30.bb b/meta-openstack/recipes-devtools/python/python-croniter_0.3.30.bb deleted file mode 100644 index c5cb4140..00000000 --- a/meta-openstack/recipes-devtools/python/python-croniter_0.3.30.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools pypi -require python-croniter.inc diff --git a/meta-openstack/recipes-devtools/python/python-cssselect_0.9.1.bb b/meta-openstack/recipes-devtools/python/python-cssselect_0.9.1.bb deleted file mode 100644 index dfd4e843..00000000 --- a/meta-openstack/recipes-devtools/python/python-cssselect_0.9.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-cssselect.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-cursive_git.bb b/meta-openstack/recipes-devtools/python/python-cursive_git.bb index 1a677f12..83be0340 100644 --- a/meta-openstack/recipes-devtools/python/python-cursive_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cursive_git.bb @@ -12,7 +12,7 @@ PV="0.2.0+git${SRCPV}" SRCREV="ad25a4016c56eeceb85764c7ac4501def2b5445a" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-debtcollector_1.22.0.bb b/meta-openstack/recipes-devtools/python/python-debtcollector_1.22.0.bb deleted file mode 100644 index 83811093..00000000 --- a/meta-openstack/recipes-devtools/python/python-debtcollector_1.22.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -inherit setuptools -require python-debtcollector.inc - -# Only for Python2 depends on funcsigs -RDEPENDS_${PN} += " \ - python-funcsigs \ - " diff --git a/meta-openstack/recipes-devtools/python/python-deprecation_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-deprecation_1.0.1.bb deleted file mode 100644 index 9f155a2e..00000000 --- a/meta-openstack/recipes-devtools/python/python-deprecation_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-deprecation.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-designateclient_git.bb b/meta-openstack/recipes-devtools/python/python-designateclient_git.bb index 42efb083..fdc92c23 100644 --- a/meta-openstack/recipes-devtools/python/python-designateclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-designateclient_git.bb @@ -34,4 +34,4 @@ PV = "3.0.0+git${SRCPV}" SRCREV = "093d8d7170cbf6ef8c7a7c0ff2a4dcd7ecd6361b" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb index 98aa8f46..6cc57ba8 100644 --- a/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb +++ b/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb @@ -1,2 +1,2 @@ require python-django-appconf.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-django-babel_git.bb b/meta-openstack/recipes-devtools/python/python-django-babel_git.bb index 1ae5c7c1..3f4f9e31 100644 --- a/meta-openstack/recipes-devtools/python/python-django-babel_git.bb +++ b/meta-openstack/recipes-devtools/python/python-django-babel_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/python-babel/${SRCNAME}.git \ S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-django-compressor_2.1.bb b/meta-openstack/recipes-devtools/python/python-django-compressor_2.1.bb index 9d528d91..f6e73dd2 100644 --- a/meta-openstack/recipes-devtools/python/python-django-compressor_2.1.bb +++ b/meta-openstack/recipes-devtools/python/python-django-compressor_2.1.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "django_compressor" SRC_URI[md5sum] = "21ecfe4e8615eae64f7068a5599df9af" SRC_URI[sha256sum] = "ae0051bc0c7a0660c93434e68d617553fccdd573293dfd15aa33f78d2b4954ef" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += " \ python-django-appconf \ diff --git a/meta-openstack/recipes-devtools/python/python-django-nose_1.4.bb b/meta-openstack/recipes-devtools/python/python-django-nose_1.4.bb index 10d22670..1e7ccd6a 100644 --- a/meta-openstack/recipes-devtools/python/python-django-nose_1.4.bb +++ b/meta-openstack/recipes-devtools/python/python-django-nose_1.4.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7f88f52f66738ec7259424ce46e855c2" SRC_URI[md5sum] = "2713d95286ea49860458a312d2efe653" SRC_URI[sha256sum] = "26cef3c6f62df2eee955a25195de6f793881317c0f5fd1a1c6f9e22f351a9313" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb index 0df4efb5..75c26b04 100644 --- a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb +++ b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb index 45f947e3..7438327b 100644 --- a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=07339dad721a3ae7e420b8b751a15c70" SRC_URI[md5sum] = "f8dbcc4d314c8e220aa311ec6561b06d" SRC_URI[sha256sum] = "0f4844f8fd3f69f4d428a616fdcf2b650a24862dd81443ae3fba14980c7b0615" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-django_git.bb b/meta-openstack/recipes-devtools/python/python-django_git.bb index f11f8e65..20086045 100644 --- a/meta-openstack/recipes-devtools/python/python-django_git.bb +++ b/meta-openstack/recipes-devtools/python/python-django_git.bb @@ -15,7 +15,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 FILES_${PN} += "${datadir}/django/*" diff --git a/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.9.0.bb b/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.9.0.bb deleted file mode 100644 index 6f531a04..00000000 --- a/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.9.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit setuptools -require python-dogpile.cache.inc - - diff --git a/meta-openstack/recipes-devtools/python/python-dogpile.core_0.4.1.bb b/meta-openstack/recipes-devtools/python/python-dogpile.core_0.4.1.bb deleted file mode 100644 index 7af5cc8f..00000000 --- a/meta-openstack/recipes-devtools/python/python-dogpile.core_0.4.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require python-dogpile.core.inc -inherit setuptools - - diff --git a/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb b/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb deleted file mode 100644 index f5785b3d..00000000 --- a/meta-openstack/recipes-devtools/python/python-ecdsa_0.13.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-ecdsa.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb b/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb index 36ab5af6..a9bff308 100644 --- a/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb +++ b/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-enum-compat.inc diff --git a/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb b/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb index 990f96bb..4eb1ed5a 100644 --- a/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb +++ b/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=4325afd396febcb659c36b49533135d4 \ SRC_URI[md5sum] = "ce75c7c3c86741175a84456cc5bd531e" SRC_URI[sha256sum] = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-eventlet_0.25.1.bb b/meta-openstack/recipes-devtools/python/python-eventlet_0.25.1.bb deleted file mode 100644 index d9c9383b..00000000 --- a/meta-openstack/recipes-devtools/python/python-eventlet_0.25.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-eventlet.inc diff --git a/meta-openstack/recipes-devtools/python/python-extras_1.0.0.bb b/meta-openstack/recipes-devtools/python/python-extras_1.0.0.bb deleted file mode 100644 index 953b9e2f..00000000 --- a/meta-openstack/recipes-devtools/python/python-extras_1.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-extras.inc diff --git a/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb b/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb index 63472106..b014a72b 100644 --- a/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb +++ b/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://README.rst;md5=2bf705a48be7b7799862ffe602c94b87" SRC_URI[md5sum] = "bf9e8bdd20700f1ff7ce6397cd441fbd" SRC_URI[sha256sum] = "92bb899bf6e58e2299e3b1de1e628b90c38544ba3354a0141d108318b50c3402" -inherit setuptools pypi +inherit setuptools3 pypi # conflicting file prevention do_install_append() { diff --git a/meta-openstack/recipes-devtools/python/python-fasteners_git.bb b/meta-openstack/recipes-devtools/python/python-fasteners_git.bb deleted file mode 100644 index 3a7326bf..00000000 --- a/meta-openstack/recipes-devtools/python/python-fasteners_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-fasteners.inc diff --git a/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb index dc03a5b5..c8883be4 100644 --- a/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=239e2f4698b85aad5ed39bae5d2ef226" SRC_URI[md5sum] = "cd6345b497a62fad739efee66346c2e0" SRC_URI[sha256sum] = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef" -inherit distutils pypi +inherit distutils3 pypi DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ diff --git a/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb b/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb index e3c2479e..f476c429 100644 --- a/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7a76e57e683629e1ac2a49406169c2a3" SRC_URI[md5sum] = "d413935bb21026c18aca82654114502f" SRC_URI[sha256sum] = "d26a9d0252da9f831b8277b824961bb10b1f9d79f4752d32e4814b7bcd1e089b" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += "python-prettytable \ python-cmd2 \ diff --git a/meta-openstack/recipes-devtools/python/python-funcsigs_1.0.2.bb b/meta-openstack/recipes-devtools/python/python-funcsigs_1.0.2.bb deleted file mode 100644 index 3adcba76..00000000 --- a/meta-openstack/recipes-devtools/python/python-funcsigs_1.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-funcsigs.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-functools32_git.bb b/meta-openstack/recipes-devtools/python/python-functools32_git.bb index f167e7d7..9744b522 100644 --- a/meta-openstack/recipes-devtools/python/python-functools32_git.bb +++ b/meta-openstack/recipes-devtools/python/python-functools32_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/MiCHiLU/python-${SRCNAME}.git" S = "${WORKDIR}/git" -inherit distutils +inherit distutils3 DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ diff --git a/meta-openstack/recipes-devtools/python/python-futures_git.bb b/meta-openstack/recipes-devtools/python/python-futures_git.bb index 015ae5f9..493aef17 100644 --- a/meta-openstack/recipes-devtools/python/python-futures_git.bb +++ b/meta-openstack/recipes-devtools/python/python-futures_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/agronholm/python${SRCNAME}.git" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb b/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb index 3571c772..4996072d 100644 --- a/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb +++ b/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI[md5sum] = "d7f98e9a5cb09fe9706e4afcbeab1552" SRC_URI[sha256sum] = "139d223503d47275636285ae98e7b470085b2b3b6fb2fc9a0d04a76de4b3d30e" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb b/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb index bc529f54..99e4946b 100644 --- a/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb +++ b/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb @@ -1,2 +1,2 @@ require python-gevent-websocket.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python-glance-store_git.bb index f6cfaa70..037e4a07 100644 --- a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance-store_git.bb @@ -12,7 +12,7 @@ PV="0.22.0+git${SRCPV}" SRCREV="49c915f498fc8d91c98fcf4e07ceecdcf167fc5a" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index a4a39cb6..0417ce58 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -19,7 +19,7 @@ PV = "15.0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools identity default_configs hosts monitor useradd systemd +inherit setuptools3 identity default_configs hosts monitor useradd systemd USER = "glance" GROUP = "glance" diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb index 393cc45a..a41405f5 100644 --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb @@ -17,7 +17,7 @@ DEPENDS += " \ python-pbr \ " -inherit setuptools monitor rmargparse +inherit setuptools3 monitor rmargparse FILES_${PN} += "${datadir}/${SRCNAME}" diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb index 0abf521f..b52fbdf7 100644 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb @@ -13,7 +13,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ gmp \ diff --git a/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb b/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb index 0abf1b99..8aec8ce6 100644 --- a/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb +++ b/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb @@ -3,7 +3,7 @@ AUTHOR = "Google Inc." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" -inherit setuptools pypi +inherit setuptools3 pypi SRC_URI[md5sum] = "3059dce9c0308852e177c7d99d3f9ac2" SRC_URI[sha256sum] = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b" diff --git a/meta-openstack/recipes-devtools/python/python-happybase_1.2.0.bb b/meta-openstack/recipes-devtools/python/python-happybase_1.2.0.bb deleted file mode 100644 index 26e39a8d..00000000 --- a/meta-openstack/recipes-devtools/python/python-happybase_1.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-happybase.inc diff --git a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb b/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb index ca6a48d8..bb8f5476 100644 --- a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb +++ b/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI[md5sum] = "0d5f8e7685e7f9a34dbd2552ffa40984" SRC_URI[sha256sum] = "de7d93338d3afb71cc4c53d713740316ead0af3a9c869b1231617347e94a8326" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += "\ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 3b4998f3..a3102ffa 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -121,7 +121,7 @@ pkg_postinst_${SRCNAME}-setup () { fi } -inherit setuptools identity hosts update-rc.d default_configs monitor +inherit setuptools3 identity hosts update-rc.d default_configs monitor PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" PACKAGES += "${SRCNAME}-setup" @@ -185,7 +185,7 @@ RDEPENDS_${PN} += " \ python-paramiko \ python-babel \ python-iso8601 \ - python-setuptools-git \ + python-setuptools3-git \ python-glanceclient \ python-keystoneclient \ python-swiftclient \ diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb index 3804f799..e0927f3c 100644 --- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb @@ -33,7 +33,7 @@ PV = "1.17.0+git${SRCPV}" SRCREV = "8af5deb458d51f4ec16e769d7fd6c94655f82f5f" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 PACKAGECONFIG ?= "bash-completion" diff --git a/meta-openstack/recipes-devtools/python/python-hgtools_6.3.bb b/meta-openstack/recipes-devtools/python/python-hgtools_6.3.bb deleted file mode 100644 index 9390c5d4..00000000 --- a/meta-openstack/recipes-devtools/python/python-hgtools_6.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-hgtools.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 5e12e873..875104a5 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -85,7 +85,7 @@ SRCREV = "246ff9f81248a00a434e66d18fad70519ba811cc" PV = "12.0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools systemd python-dir default_configs monitor useradd +inherit setuptools3 systemd python3-dir default_configs monitor useradd USER = "horizon" GROUP = "horizon" diff --git a/meta-openstack/recipes-devtools/python/python-hp3parclient_3.2.0.bb b/meta-openstack/recipes-devtools/python/python-hp3parclient_3.2.0.bb index 2b8a548b..269c73e1 100644 --- a/meta-openstack/recipes-devtools/python/python-hp3parclient_3.2.0.bb +++ b/meta-openstack/recipes-devtools/python/python-hp3parclient_3.2.0.bb @@ -11,4 +11,4 @@ SRC_URI += " \ SRC_URI[md5sum] = "f4cc346281ae86c21b5f975cc3b4d759" SRC_URI[sha256sum] = "83c0c00a5ba9fd5cecf6f32c6aea9d222e34abcb521548988b70ac8d062ec2f2" -inherit setuptools pypi +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python-httplib2_0.14.0.bb b/meta-openstack/recipes-devtools/python/python-httplib2_0.14.0.bb deleted file mode 100644 index 8f981636..00000000 --- a/meta-openstack/recipes-devtools/python/python-httplib2_0.14.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-httplib2.inc diff --git a/meta-openstack/recipes-devtools/python/python-httpretty_0.9.7.bb b/meta-openstack/recipes-devtools/python/python-httpretty_0.9.7.bb deleted file mode 100644 index 8993807d..00000000 --- a/meta-openstack/recipes-devtools/python/python-httpretty_0.9.7.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools -require python-httpretty.inc - diff --git a/meta-openstack/recipes-devtools/python/python-i18n_0.3.1.bb b/meta-openstack/recipes-devtools/python/python-i18n_0.3.1.bb deleted file mode 100644 index 3e0acdd1..00000000 --- a/meta-openstack/recipes-devtools/python/python-i18n_0.3.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-i18n.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb b/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb index 501e895b..989f7154 100644 --- a/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb +++ b/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=d8b8c1199001505d7b77da5db34ba441" SRC_URI[md5sum] = "f2c7852f95862715f92e7d089dc3f2cf" SRC_URI[sha256sum] = "1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7" -inherit distutils pypi +inherit distutils3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-jsonext_0.4.2.bb b/meta-openstack/recipes-devtools/python/python-jsonext_0.4.2.bb index 90575c6d..fad44f5e 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonext_0.4.2.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonext_0.4.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI[md5sum] = "59207a244eba23bf628ed24935e4eee7" SRC_URI[sha256sum] = "e7634e0b8d1a668bd2c92db5498f6162573feb72ac050c4415384e773b1ea091" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += " \ python-six \ diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb b/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb index 53cc1c45..cd845474 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/sileht/${BPN}.git" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb b/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb index 1f8dd550..c320f012 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb @@ -1,2 +1,2 @@ require python-jsonpath-rw.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-kafka_git.bb b/meta-openstack/recipes-devtools/python/python-kafka_git.bb deleted file mode 100644 index 8a474c85..00000000 --- a/meta-openstack/recipes-devtools/python/python-kafka_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require python-kafka.inc -inherit setuptools - diff --git a/meta-openstack/recipes-devtools/python/python-kazoo_2.0.bb b/meta-openstack/recipes-devtools/python/python-kazoo_2.0.bb index 78a006bb..db7c0238 100644 --- a/meta-openstack/recipes-devtools/python/python-kazoo_2.0.bb +++ b/meta-openstack/recipes-devtools/python/python-kazoo_2.0.bb @@ -10,7 +10,7 @@ PYPI_SRC_URI = "https://pypi.python.org/packages/source/k/${SRCNAME}/kazoo-${PV} SRC_URI[md5sum] = "4b172de456c102b0e33f661e7e2b3583" SRC_URI[sha256sum] = "f0c42cc7752a331ba59269827bd19cb271210399a9dcab32b6a91465b4431a18" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb b/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb index 589fdef0..e137fc67 100644 --- a/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb +++ b/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb @@ -9,6 +9,6 @@ PYPI_PACKAGE_EXT = "zip" SRC_URI[md5sum] = "fd50a2be4a44a78efb09a7c046b6410d" SRC_URI[sha256sum] = "ac2b4dc17e6edfb804b09ade15df79f251522e442976ea0c8ea0051474502cf5" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " python-hgtools" diff --git a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb index 8d38426c..e595180c 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb @@ -12,7 +12,7 @@ PV="git${SRCPV}" SRCREV="0bd376242f8522edef7031d2339b9533b86c17aa" S = "${WORKDIR}/git" -inherit python-dir +inherit python3-dir do_install_append() { install -D -m 0644 hybrid_assignment.py ${D}/${PYTHON_SITEPACKAGES_DIR}/keystone/assignment/backends/hybrid_assignment.py diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index b8b4fb08..a8cc9440 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -26,7 +26,7 @@ PV = "12.0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools identity hosts default_configs monitor useradd systemd +inherit setuptools3 identity hosts default_configs monitor useradd systemd SERVICE_TOKEN = "password" TOKEN_FORMAT ?= "PKI" diff --git a/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.18.0.bb b/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.18.0.bb deleted file mode 100644 index f244f7db..00000000 --- a/meta-openstack/recipes-devtools/python/python-keystoneauth1_3.18.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-keystoneauth1.inc diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb index e82c5f62..c7bfef42 100644 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb @@ -15,7 +15,7 @@ PV = "3.13.0+git${SRCPV}" SRCREV = "7ff05baa1fa56f152173651f16fc6fd181291292" S = "${WORKDIR}/git" -inherit setuptools monitor +inherit setuptools3 monitor FILES_${PN}-doc += "${datadir}/keystoneclient" diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb index 557a557f..c7309063 100644 --- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb @@ -14,7 +14,7 @@ PV = "4.17.0+git${SRCPV}" SRCREV = "69aed2693475797c8d0dda2725a790eea05a9419" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-kombu_4.6.6.bb b/meta-openstack/recipes-devtools/python/python-kombu_4.6.6.bb deleted file mode 100644 index 8c5c4d6b..00000000 --- a/meta-openstack/recipes-devtools/python/python-kombu_4.6.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools -require python-kombu.inc - diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb b/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb deleted file mode 100644 index 43d7ff81..00000000 --- a/meta-openstack/recipes-devtools/python/python-lesscpy_0.10.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-lesscpy.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb index 61915777..e5730901 100644 --- a/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb +++ b/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72" SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9" SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799" -inherit distutils pypi +inherit distutils3 pypi DEPENDS += "\ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-logutils_0.3.5.bb b/meta-openstack/recipes-devtools/python/python-logutils_0.3.5.bb deleted file mode 100644 index 9331a16d..00000000 --- a/meta-openstack/recipes-devtools/python/python-logutils_0.3.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-logutils.inc diff --git a/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb b/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb index 1bed1ed4..959852b0 100644 --- a/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb @@ -36,4 +36,4 @@ PV = "1.0.0.0b1+git${SRCPV}" SRCREV = "fb1ff6777eb96a5b7ba38156bf8354cda9b88ad4" S = "${WORKDIR}/git" -inherit setuptools rmargparse +inherit setuptools3 rmargparse diff --git a/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb b/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb index 6984a9e2..2748efc2 100644 --- a/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb @@ -37,4 +37,4 @@ PV = "1.29.0+git${SRCPV}" SRCREV = "1b2cafb008bee70242b68a03212bcc575df683b9" S = "${WORKDIR}/git" -inherit setuptools rmargparse +inherit setuptools3 rmargparse diff --git a/meta-openstack/recipes-devtools/python/python-mccabe_0.2.1.bb b/meta-openstack/recipes-devtools/python/python-mccabe_0.2.1.bb deleted file mode 100644 index 68c22385..00000000 --- a/meta-openstack/recipes-devtools/python/python-mccabe_0.2.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-mccabe.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-memcache_1.2.9.bb b/meta-openstack/recipes-devtools/python/python-memcache_1.2.9.bb deleted file mode 100644 index 2027c2ab..00000000 --- a/meta-openstack/recipes-devtools/python/python-memcache_1.2.9.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-memcache.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-memcached_git.bb b/meta-openstack/recipes-devtools/python/python-memcached_git.bb deleted file mode 100644 index f237d56c..00000000 --- a/meta-openstack/recipes-devtools/python/python-memcached_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-memcached.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-microversion-parse_git.bb b/meta-openstack/recipes-devtools/python/python-microversion-parse_git.bb index d83ff002..464649e9 100644 --- a/meta-openstack/recipes-devtools/python/python-microversion-parse_git.bb +++ b/meta-openstack/recipes-devtools/python/python-microversion-parse_git.bb @@ -12,7 +12,7 @@ PV = "0.1.4+git${SRCPV}" SRCREV = "1f6eac7c3df048679663919f75c2bcecd3e183a2" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-mimeparse_0.1.4.bb b/meta-openstack/recipes-devtools/python/python-mimeparse_0.1.4.bb index 1ab4242a..c9b17ff4 100644 --- a/meta-openstack/recipes-devtools/python/python-mimeparse_0.1.4.bb +++ b/meta-openstack/recipes-devtools/python/python-mimeparse_0.1.4.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "python-mimeparse" SRC_URI[md5sum] = "1d2816a16f17dcfe0c613da611fe7e13" SRC_URI[sha256sum] = "3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3" -inherit distutils pypi +inherit distutils3 pypi DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ diff --git a/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb b/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb index 1c6a9bd8..c9002e9e 100644 --- a/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb @@ -29,4 +29,4 @@ PV = "1.1.0+git${SRCPV}" SRCREV = "48e2780ee0148efc186c8972ca22e572fa2433c5" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-mock_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-mock_1.0.1.bb index d3da911e..badb21c3 100644 --- a/meta-openstack/recipes-devtools/python/python-mock_1.0.1.bb +++ b/meta-openstack/recipes-devtools/python/python-mock_1.0.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e5ba73891255687dff3bee2b4cbb16" SRC_URI[md5sum] = "c3971991738caa55ec7c356bbc154ee2" SRC_URI[sha256sum] = "b839dd2d9c117c701430c149956918a423a9863b48b09c90e30a6013e7d2f44f" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += "python-prettytable \ python-cmd2 \ diff --git a/meta-openstack/recipes-devtools/python/python-mox3_0.28.0.bb b/meta-openstack/recipes-devtools/python/python-mox3_0.28.0.bb index 28ffe16c..770569b8 100644 --- a/meta-openstack/recipes-devtools/python/python-mox3_0.28.0.bb +++ b/meta-openstack/recipes-devtools/python/python-mox3_0.28.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI[md5sum] = "c930d8479996541b04447a67e96e4a62" SRC_URI[sha256sum] = "8094868e70f814b4a526ecc592365437bc93a7dd60341321344987b3e8dba49d" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += "\ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb b/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb index 15c2af64..bdd5fbee 100644 --- a/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb +++ b/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI[md5sum] = "6de7371e7e8bd9e2dad3fef2646f4a43" SRC_URI[sha256sum] = "424ee725ee12652802b4e86571f816059b0d392401ceae70bf6487d65602cba9" -inherit distutils pypi +inherit distutils3 pypi DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ diff --git a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb index 1ac7dca1..7a3223f4 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb @@ -12,7 +12,7 @@ PV="1.9.1+git${SRCPV}" SRCREV="f0d7e470c2ef1702b2715ceb2fd8a00fce2a23be" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index a054551d..08374569 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -32,7 +32,7 @@ PV = "11.0.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools systemd useradd identity hosts default_configs monitor +inherit setuptools3 systemd useradd identity hosts default_configs monitor USER = "neutron" GROUP = "neutron" diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb index 9fac59d2..f519bf7d 100644 --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb @@ -43,7 +43,7 @@ PV = "6.5.0+git${SRCPV}" SRCREV = "e145c4ef8a0e8390f0468df422a757760e77f823" S = "${WORKDIR}/git" -inherit setuptools monitor rmargparse +inherit setuptools3 monitor rmargparse PACKAGECONFIG ?= "bash-completion" PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" diff --git a/meta-openstack/recipes-devtools/python/python-nose-exclude_0.2.0.bb b/meta-openstack/recipes-devtools/python/python-nose-exclude_0.2.0.bb index 95fee0ff..0a674c6b 100644 --- a/meta-openstack/recipes-devtools/python/python-nose-exclude_0.2.0.bb +++ b/meta-openstack/recipes-devtools/python/python-nose-exclude_0.2.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe SRC_URI[md5sum] = "c8d798c3e29ac82dd5c7bf98a99404af" SRC_URI[sha256sum] = "27babdc53e0741ed09d21b7fdb5d244aabb1679f67ef81289f0f34e50aca51c9" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 3e646dfc..008a124e 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -38,7 +38,7 @@ PV = "16.0.4+git${SRCPV}" S = "${WORKDIR}/git" -inherit systemd setuptools identity hosts useradd default_configs monitor +inherit systemd setuptools3 identity hosts useradd default_configs monitor LIBVIRT_IMAGES_TYPE ?= "default" @@ -295,7 +295,7 @@ RDEPENDS_${PN} += " \ python-requests \ python-six \ python-stevedore \ - python-setuptools \ + python-setuptools3 \ python-websockify \ python-oslo.cache \ python-oslo.concurrency \ diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb index 82995ee3..f85ae4d3 100644 --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb @@ -13,7 +13,7 @@ PV = "9.1.1+git${SRCPV}" SRCREV = "204eff6dc7b234d2807a6caa24a2fc58ebee520b" S = "${WORKDIR}/git" -inherit setuptools monitor rmargparse +inherit setuptools3 monitor rmargparse DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python-novnc_git.bb index 3f3b5afe..4898baea 100644 --- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb +++ b/meta-openstack/recipes-devtools/python/python-novnc_git.bb @@ -11,10 +11,10 @@ SRCREV = "3b8ec46fd26d644e6edbea4f46e630929297e448" PV = "0.5.1+git${SRCPV}" SRC_URI = "git://github.com/kanaka/noVNC.git \ - file://python-distutils.patch" + file://python-distutils3.patch" S = "${WORKDIR}/git" -inherit distutils +inherit distutils3 DEPENDS += " python-websockify" diff --git a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb index aa046639..38351385 100644 --- a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb +++ b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=15c871e114b5cb956dacad28f4db57c7" SRC_URI[md5sum] = "987ad7365a70e2286bd1cebb344debbc" SRC_URI[sha256sum] = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += "python-prettytable \ python-cmd2 \ diff --git a/meta-openstack/recipes-devtools/python/python-oauth2client_4.1.2.bb b/meta-openstack/recipes-devtools/python/python-oauth2client_4.1.2.bb deleted file mode 100644 index 5622422c..00000000 --- a/meta-openstack/recipes-devtools/python/python-oauth2client_4.1.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-oauth2client.inc diff --git a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb index 3b5d38fa..a5be175c 100644 --- a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb +++ b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5ba9ce41463615e082609806255bce1b" SRC_URI[md5sum] = "eb60abdb002b9c08d248707b79a1cc92" SRC_URI[sha256sum] = "a051f04ee8ec3305055ab34d87b36c9a449375e07c7d6a05bcafa48329cac7c3" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-openstack-nose_0.11.bb b/meta-openstack/recipes-devtools/python/python-openstack-nose_0.11.bb index f33e5152..42d836f4 100644 --- a/meta-openstack/recipes-devtools/python/python-openstack-nose_0.11.bb +++ b/meta-openstack/recipes-devtools/python/python-openstack-nose_0.11.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "openstack.nose_plugin" SRC_URI[md5sum] = "0c6547f413db8c66921b110f78132aac" SRC_URI[sha256sum] = "a28d44dc23de8164d7893da7020404c73c4325b46d5507911f0257c15f613b4f" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb index ce33f0cc..57f1175d 100644 --- a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb @@ -12,7 +12,7 @@ PV = "3.12.0+git${SRCPV}" SRCREV = "ff4abb7d19829efa0209cb67faf01011d9c841c5" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += "\ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb index 12472ecb..9f370bfc 100644 --- a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb +++ b/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb @@ -12,7 +12,7 @@ PV = "0.9.19+git${SRCPV}" SRCREV = "bd60aa4a21676b8901691298eb0786fc231f7bff" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += "\ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-ordereddict_1.1.bb b/meta-openstack/recipes-devtools/python/python-ordereddict_1.1.bb deleted file mode 100644 index 9aa3f3e1..00000000 --- a/meta-openstack/recipes-devtools/python/python-ordereddict_1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-ordereddict.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python-os-brick_git.bb index f266f707..95b7cccb 100644 --- a/meta-openstack/recipes-devtools/python/python-os-brick_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-brick_git.bb @@ -12,7 +12,7 @@ PV = "1.15.5+git${SRCPV}" SRCREV = "4090db76673cadb3b8adfceb106069e03414de49" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 FILES_${PN} += "${datadir}/etc/*" diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb b/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb index 3f42bdce..207d5596 100644 --- a/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-client-config_git.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-os-client-config.inc diff --git a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb b/meta-openstack/recipes-devtools/python/python-os-traits_git.bb index 8d4079b1..570fec41 100644 --- a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-traits_git.bb @@ -12,7 +12,7 @@ PV = "0.3.3+git${SRCPV}" SRCREV = "3e8b4a77aaf2d8b64f89ba3b479113d0b44bbe2f" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python-os-vif_git.bb index 52fa05e9..fd369125 100644 --- a/meta-openstack/recipes-devtools/python/python-os-vif_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-vif_git.bb @@ -12,7 +12,7 @@ PV = "1.7.0+git${SRCPV}" SRCREV = "5184b7fc3b8d1689823eacb859087c8a943f9a09" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-os-win_git.bb b/meta-openstack/recipes-devtools/python/python-os-win_git.bb index a7425060..67b63a41 100644 --- a/meta-openstack/recipes-devtools/python/python-os-win_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-win_git.bb @@ -12,7 +12,7 @@ PV = "2.2.0+git${SRCPV}" SRCREV = "b507ec4e7cb5eead7a008e4d002bc31b85359908" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb b/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb index f3d54f66..66850d09 100644 --- a/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb +++ b/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb @@ -11,7 +11,7 @@ PV = "0.3.1+git${SRCPV}" SRCREV = "7dce682e2ab0c14236dbc58a38c925536b3b6f8d" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb b/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb index d8c72e74..256c286d 100644 --- a/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb +++ b/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-osc-lib.inc diff --git a/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb index e71a815b..f109b8a1 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb index fe095d04..567606c8 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb index eed00c58..6a0498c8 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools rmargparse +inherit setuptools3 rmargparse DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb index bf1ae7af..42f58ace 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb @@ -11,7 +11,7 @@ PV = "2.17.0+git${SRCPV}" SRCREV = "f4b6914db02e6bcf0de4a97bbc3dc85dd6e06d91" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb index d693570c..a330ed4b 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb index 19105327..1dedfa22 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb deleted file mode 100644 index b990e67b..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-oslo.i18n.inc diff --git a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb index d6ca0ee3..091ae361 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb @@ -11,7 +11,7 @@ PV = "3.30.0+git${SRCPV}" SRCREV = "ad776e84b51223b85b7dfa85a7e77bb2f3848f4b" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb index 7fe66f1b..28404e30 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb @@ -11,7 +11,7 @@ PV = "5.30.1+git${SRCPV}" SRCREV = "a07d852b237d229a0f4dd55fd83379c0581e44e9" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb index 3a1d4d9b..b5a68357 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb index 0e7a6adf..638399a6 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb index 83504b63..df0210ad 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb @@ -11,7 +11,7 @@ PV = "1.22.1+git${SRCPV}" SRCREV = "d27bb5371c90e0f8b1bdf1bc24f16e1532b3e595" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb index 2db5aae8..7a6cdd7c 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb index 2dbbfe8a..70a56582 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb index b11957d9..80b86bb1 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb @@ -11,7 +11,7 @@ PV = "2.20.0+git${SRCPV}" SRCREV = "e56d91427c11a3813a0154d47e804018e580086e" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb index 7b72ad25..392270da 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb deleted file mode 100644 index 1fe6253b..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit setuptools -require python-oslo.utils.inc - -# RDEPENDS only for python2 -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-monotonic \ - ${PYTHON_PN}-funcsigs \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb index 574ac881..16a57e18 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb index f6e7b5eb..cd22954c 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python-oslotest_git.bb index 20c0b53e..f60b3729 100644 --- a/meta-openstack/recipes-devtools/python/python-oslotest_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslotest_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += "\ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb b/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb index 8dcab0db..e6fe8656 100644 --- a/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb +++ b/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5" SRC_URI[md5sum] = "75f190b00ac248b3d547b67a480801db" SRC_URI[sha256sum] = "6915cbf8ac390dc3e125340b0ff368dd53f5889e3d053f9122dd83ba0dd366f7" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-ovs_2.7.2.bb b/meta-openstack/recipes-devtools/python/python-ovs_2.7.2.bb deleted file mode 100644 index cd3685d0..00000000 --- a/meta-openstack/recipes-devtools/python/python-ovs_2.7.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-ovs.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb index cc1f424b..c464f2a3 100644 --- a/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb @@ -11,7 +11,7 @@ PV = "0.4.1+git${SRCPV}" SRCREV = "742754bce3c9453f8c7186455a92e4f6d6b18ace" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-pam_0.1.4.bb b/meta-openstack/recipes-devtools/python/python-pam_0.1.4.bb deleted file mode 100644 index b583d30c..00000000 --- a/meta-openstack/recipes-devtools/python/python-pam_0.1.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pam.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-paramiko_2.6.0.bb b/meta-openstack/recipes-devtools/python/python-paramiko_2.6.0.bb deleted file mode 100644 index fedbf867..00000000 --- a/meta-openstack/recipes-devtools/python/python-paramiko_2.6.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-paramiko.inc diff --git a/meta-openstack/recipes-devtools/python/python-paste_2.0.2.bb b/meta-openstack/recipes-devtools/python/python-paste_2.0.2.bb deleted file mode 100644 index e82dd2a8..00000000 --- a/meta-openstack/recipes-devtools/python/python-paste_2.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-paste.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-pastedeploy_2.0.1.bb b/meta-openstack/recipes-devtools/python/python-pastedeploy_2.0.1.bb deleted file mode 100644 index 8457858c..00000000 --- a/meta-openstack/recipes-devtools/python/python-pastedeploy_2.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pastedeploy.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb deleted file mode 100644 index 02aafbf8..00000000 --- a/meta-openstack/recipes-devtools/python/python-pathlib_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pathlib.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-pecan_1.3.3.bb b/meta-openstack/recipes-devtools/python/python-pecan_1.3.3.bb deleted file mode 100644 index 6fa052e1..00000000 --- a/meta-openstack/recipes-devtools/python/python-pecan_1.3.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-pecan.inc diff --git a/meta-openstack/recipes-devtools/python/python-pep8_1.6.2.bb b/meta-openstack/recipes-devtools/python/python-pep8_1.6.2.bb index a0f91a72..7a131d7f 100644 --- a/meta-openstack/recipes-devtools/python/python-pep8_1.6.2.bb +++ b/meta-openstack/recipes-devtools/python/python-pep8_1.6.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://README.rst;md5=b0d37793ab91ca25ad5c200e9ea22331" SRC_URI[md5sum] = "a03bb494859e87b42601b61b1b043a0c" SRC_URI[sha256sum] = "603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f61bed8" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += "python-prettytable \ python-cmd2 \ diff --git a/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb b/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb index 482e5648..049e5213 100644 --- a/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb +++ b/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-pika-pool.inc diff --git a/meta-openstack/recipes-devtools/python/python-positional_1.2.1.bb b/meta-openstack/recipes-devtools/python/python-positional_1.2.1.bb deleted file mode 100644 index 14f0187c..00000000 --- a/meta-openstack/recipes-devtools/python/python-positional_1.2.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-positional.inc diff --git a/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb index 595af50c..9e79b1c6 100644 --- a/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb +++ b/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-posix-ipc.inc diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb index 740643df..2c9378a5 100644 --- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb +++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb @@ -12,7 +12,7 @@ SRC_URI += " \ SRC_URI[md5sum] = "9e7d6f695fc7f8d1c42a7905449246c9" SRC_URI[sha256sum] = "eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e" -inherit distutils pypi +inherit distutils3 pypi DEPENDS += " \ postgresql \ diff --git a/meta-openstack/recipes-devtools/python/python-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python-pycadf_git.bb index d86356be..03a105d8 100644 --- a/meta-openstack/recipes-devtools/python/python-pycadf_git.bb +++ b/meta-openstack/recipes-devtools/python/python-pycadf_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 FILES_${PN} += "${datadir}/etc/${SRCNAME}/*" diff --git a/meta-openstack/recipes-devtools/python/python-pyflakes_0.7.3.bb b/meta-openstack/recipes-devtools/python/python-pyflakes_0.7.3.bb deleted file mode 100644 index 78a2e094..00000000 --- a/meta-openstack/recipes-devtools/python/python-pyflakes_0.7.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pyflakes.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb b/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb index a646c476..85cf55a4 100644 --- a/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb +++ b/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI[md5sum] = "54e4dfaa569350254b0a0f4c19686ded" SRC_URI[sha256sum] = "ab27d4efb59105555b6c9b1fe7792fd895ad9ca893058c39bba4106d6a0ad986" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += " \ python-lxml \ diff --git a/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb b/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb index 08bb0d63..3e1aa9bb 100644 --- a/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb +++ b/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rohe/${SRCNAME}.git" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb b/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb index bbdc6f32..60e300de 100644 --- a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb +++ b/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "pyScss" SRC_URI[md5sum] = "9527b4864cd6023f77a8277e6fb773d7" SRC_URI[sha256sum] = "d0323110ecc7d3ead6b99cfec31301306928130e4d0a9eb13226bf390aba8c0e" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-pysnmp_4.2.5.bb b/meta-openstack/recipes-devtools/python/python-pysnmp_4.2.5.bb deleted file mode 100644 index 2c415141..00000000 --- a/meta-openstack/recipes-devtools/python/python-pysnmp_4.2.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pysnmp.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb b/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb index 41ca76cd..6b8de00e 100644 --- a/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb +++ b/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a85bd923e5c830f8eb89db354ff72f38" SRC_URI[md5sum] = "7ff1cedee74646b50117acff87aa1cfa" SRC_URI[sha256sum] = "fe9c35216bf56c858b34c4b4c8be7e34566ddef29670e5a5b43f9cb8ecfbb28d" -inherit setuptools pypi +inherit setuptools3 pypi FILES_${PN} += "${datadir}/*" diff --git a/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb b/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb index e599e77d..4e332658 100644 --- a/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb @@ -1,2 +1,2 @@ require python-pytest-salt.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-python-editor_git.bb b/meta-openstack/recipes-devtools/python/python-python-editor_git.bb index 322aca4f..7529398a 100644 --- a/meta-openstack/recipes-devtools/python/python-python-editor_git.bb +++ b/meta-openstack/recipes-devtools/python/python-python-editor_git.bb @@ -1,2 +1,2 @@ require python-python-editor.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb index 31d42424..82a91ba0 100644 --- a/meta-openstack/recipes-devtools/python/python-rally_git.bb +++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb @@ -24,7 +24,7 @@ SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a" PV="git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d hosts identity default_configs +inherit setuptools3 update-rc.d hosts identity default_configs do_install_append() { RALLY_CONF_DIR=${D}${sysconfdir}/${SRCNAME} diff --git a/meta-openstack/recipes-devtools/python/python-rcssmin_1.0.6.bb b/meta-openstack/recipes-devtools/python/python-rcssmin_1.0.6.bb deleted file mode 100644 index 9b7624be..00000000 --- a/meta-openstack/recipes-devtools/python/python-rcssmin_1.0.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-rcssmin.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-repoze.lru_0.7.bb b/meta-openstack/recipes-devtools/python/python-repoze.lru_0.7.bb deleted file mode 100644 index 2343a4c5..00000000 --- a/meta-openstack/recipes-devtools/python/python-repoze.lru_0.7.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-repoze.lru.inc diff --git a/meta-openstack/recipes-devtools/python/python-repoze.who_2.2.bb b/meta-openstack/recipes-devtools/python/python-repoze.who_2.2.bb deleted file mode 100644 index 236b8f98..00000000 --- a/meta-openstack/recipes-devtools/python/python-repoze.who_2.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-repoze.who.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-requestsexceptions_1.4.0.bb b/meta-openstack/recipes-devtools/python/python-requestsexceptions_1.4.0.bb deleted file mode 100644 index 87b6ca98..00000000 --- a/meta-openstack/recipes-devtools/python/python-requestsexceptions_1.4.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-requestsexceptions.inc diff --git a/meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb b/meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb deleted file mode 100644 index 19bf62c4..00000000 --- a/meta-openstack/recipes-devtools/python/python-retrying_1.3.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-retrying.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-rfc3986_1.3.2.bb b/meta-openstack/recipes-devtools/python/python-rfc3986_1.3.2.bb deleted file mode 100644 index 003f6e16..00000000 --- a/meta-openstack/recipes-devtools/python/python-rfc3986_1.3.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-rfc3986.inc diff --git a/meta-openstack/recipes-devtools/python/python-rjsmin_1.0.12.bb b/meta-openstack/recipes-devtools/python/python-rjsmin_1.0.12.bb deleted file mode 100644 index 528c4a0d..00000000 --- a/meta-openstack/recipes-devtools/python/python-rjsmin_1.0.12.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-rjsmin.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-routes_git.bb b/meta-openstack/recipes-devtools/python/python-routes_git.bb deleted file mode 100644 index 11fea85f..00000000 --- a/meta-openstack/recipes-devtools/python/python-routes_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-routes.inc diff --git a/meta-openstack/recipes-devtools/python/python-rsa_3.4.2.bb b/meta-openstack/recipes-devtools/python/python-rsa_3.4.2.bb deleted file mode 100644 index 349e7cd9..00000000 --- a/meta-openstack/recipes-devtools/python/python-rsa_3.4.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-rsa.inc diff --git a/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb b/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb index 5e4d074c..571b68c6 100644 --- a/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb +++ b/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb @@ -1,2 +1,2 @@ require python-rtslib-fb.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb index b5ee113b..5e781442 100644 --- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/osrg/${SRCNAME}.git" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 FILES_${PN} += "${datadir}/etc/${SRCNAME}/*" diff --git a/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb deleted file mode 100644 index 4b9587f6..00000000 --- a/meta-openstack/recipes-devtools/python/python-saharaclient_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-saharaclient.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb b/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb index 2a5ed206..d5d1e3e4 100644 --- a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb +++ b/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb @@ -20,5 +20,5 @@ RDEPENDS_${PN} = "\ python-unittest \ " -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb b/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb index 2ca2d92d..f4191f55 100644 --- a/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb +++ b/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb @@ -1,2 +1,2 @@ require python-semantic-version.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb b/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb index 03170021..5dd6804a 100644 --- a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb +++ b/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb @@ -1,2 +1,2 @@ -inherit setuptools +inherit setuptools3 require python-setuptools-git.inc diff --git a/meta-openstack/recipes-devtools/python/python-simplegeneric_0.8.1.bb b/meta-openstack/recipes-devtools/python/python-simplegeneric_0.8.1.bb deleted file mode 100644 index 5a1cc6a2..00000000 --- a/meta-openstack/recipes-devtools/python/python-simplegeneric_0.8.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-simplegeneric.inc diff --git a/meta-openstack/recipes-devtools/python/python-singledispatch_3.4.0.3.bb b/meta-openstack/recipes-devtools/python/python-singledispatch_3.4.0.3.bb deleted file mode 100644 index 47c66984..00000000 --- a/meta-openstack/recipes-devtools/python/python-singledispatch_3.4.0.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-singledispatch.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.13.0.bb b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.13.0.bb index ce9ccac7..d99f638c 100644 --- a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.13.0.bb +++ b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.13.0.bb @@ -9,7 +9,7 @@ inherit pypi SRC_URI[md5sum] = "86572c92ae84334907f5e3a2cecc92a6" SRC_URI[sha256sum] = "0bc02e292a040ade5e35a01d3ea744119e1309cdddb704fdb99bac13236614f8" -inherit setuptools +inherit setuptools3 # Satisfy setup.py 'setup_requires' DEPENDS += " \ diff --git a/meta-openstack/recipes-devtools/python/python-statsd_3.3.0.bb b/meta-openstack/recipes-devtools/python/python-statsd_3.3.0.bb deleted file mode 100644 index 51b179b4..00000000 --- a/meta-openstack/recipes-devtools/python/python-statsd_3.3.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-statsd.inc diff --git a/meta-openstack/recipes-devtools/python/python-subunit_1.1.0.bb b/meta-openstack/recipes-devtools/python/python-subunit_1.1.0.bb index e7c68287..c18d1c4a 100644 --- a/meta-openstack/recipes-devtools/python/python-subunit_1.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python-subunit_1.1.0.bb @@ -9,4 +9,4 @@ PYPI_PACKAGE = "python-subunit" SRC_URI[md5sum] = "d2c09c93346077ced675c9f718e6a0f1" SRC_URI[sha256sum] = "d9a7606e9610828d68c1d2f0f5abbb421e34e518b8f4882c8b2e08176281bf88" -inherit setuptools pypi +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb b/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb index 52bb6d89..d230c8de 100644 --- a/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb +++ b/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb @@ -1,3 +1,3 @@ -inherit setuptools +inherit setuptools3 require python-suds-jurko.inc diff --git a/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb b/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb index 5e12e372..c1e79a03 100644 --- a/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb +++ b/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb @@ -12,4 +12,4 @@ SRC_URI = "https://fedorahosted.org/releases/s/u/${SRCNAME}/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "95a2f04378931e973cbb3cca8f8d9765" SRC_URI[sha256sum] = "dd711c2635483733cd3aebf5073edf338595a2d2cae1398041f0273e9bdaac66" -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index fc7c2580..87f7f049 100644 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb @@ -20,7 +20,7 @@ SRCREV="4ca08cc395e686265574366497a6869e94eebcb2" PV="2.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools python-dir update-rc.d hosts identity +inherit setuptools3 python3-dir update-rc.d hosts identity # The size of the backing file (in Gigabytes) of loopback devices # which are used for setting up Swift storage devices. The value diff --git a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb index e5dea821..7a99e8a5 100644 --- a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb @@ -13,7 +13,7 @@ PV = "3.8.1+git${SRCPV}" SRCREV = "72b90fed4c62cf75497a7d66714f5fb0aa91f18b" S = "${WORKDIR}/git" -inherit setuptools python-dir +inherit setuptools3 python3-dir do_install_append() { cp -r tests ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/ diff --git a/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb b/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb index 08a2ee07..0e3dcd1f 100644 --- a/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb +++ b/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb @@ -1,2 +1,2 @@ require python-sysv-ipc.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python-taskflow_git.bb index 1717617d..76371a87 100644 --- a/meta-openstack/recipes-devtools/python/python-taskflow_git.bb +++ b/meta-openstack/recipes-devtools/python/python-taskflow_git.bb @@ -12,7 +12,7 @@ PV="2.14.1+git${SRCPV}" SRCREV="ed867c4fd17e4102a133c313a13af37baccf14a4" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-tempita_0.5.3dev.bb b/meta-openstack/recipes-devtools/python/python-tempita_0.5.3dev.bb deleted file mode 100644 index 8a8e8a2f..00000000 --- a/meta-openstack/recipes-devtools/python/python-tempita_0.5.3dev.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-tempita.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-tenacity_5.1.1.bb b/meta-openstack/recipes-devtools/python/python-tenacity_5.1.1.bb index 742d6a46..bbe62f5e 100644 --- a/meta-openstack/recipes-devtools/python/python-tenacity_5.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python-tenacity_5.1.1.bb @@ -9,12 +9,12 @@ inherit pypi SRC_URI[md5sum] = "c960e3f0c66207c85bbae72a8232278b" SRC_URI[sha256sum] = "a4eb168dbf55ed2cae27e7c6b2bd48ab54dabaf294177d998330cf59f294c112" -inherit setuptools +inherit setuptools3 # Satisfy setup.py 'setup_requires' DEPENDS += " \ python-pbr-native \ - python-setuptools-scm-native \ + python-setuptools3-scm-native \ " RDEPENDS_${PN} += " \ diff --git a/meta-openstack/recipes-devtools/python/python-termcolor_1.1.0.bb b/meta-openstack/recipes-devtools/python/python-termcolor_1.1.0.bb index 20b8e2cf..8c590497 100644 --- a/meta-openstack/recipes-devtools/python/python-termcolor_1.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python-termcolor_1.1.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d" SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df" SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b" -inherit distutils pypi +inherit distutils3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-testrepository_0.0.20.bb b/meta-openstack/recipes-devtools/python/python-testrepository_0.0.20.bb deleted file mode 100644 index 3788ce10..00000000 --- a/meta-openstack/recipes-devtools/python/python-testrepository_0.0.20.bb +++ /dev/null @@ -1,3 +0,0 @@ -require python-testrepository.inc -inherit setuptools - diff --git a/meta-openstack/recipes-devtools/python/python-testresources_0.2.7.bb b/meta-openstack/recipes-devtools/python/python-testresources_0.2.7.bb deleted file mode 100644 index d939405f..00000000 --- a/meta-openstack/recipes-devtools/python/python-testresources_0.2.7.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-testresources.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb b/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb deleted file mode 100644 index 868a5b9a..00000000 --- a/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-testscenarios.inc diff --git a/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb b/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb deleted file mode 100644 index 56ff9de0..00000000 --- a/meta-openstack/recipes-devtools/python/python-testtools_2.3.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-testtools.inc diff --git a/meta-openstack/recipes-devtools/python/python-thrift_0.9.2.bb b/meta-openstack/recipes-devtools/python/python-thrift_0.9.2.bb deleted file mode 100644 index 4d01cb5d..00000000 --- a/meta-openstack/recipes-devtools/python/python-thrift_0.9.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-thrift.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb b/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb index 28e230d1..9da58133 100644 --- a/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb +++ b/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI[md5sum] = "2663568ba3e1793da7b21003f0847fdd" SRC_URI[sha256sum] = "b4d64227f023f1f0736ef137bd4c901c7652563e62c7a20329222c3a0b14d84f" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += " \ python-six \ diff --git a/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb b/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb index 6260663e..1443b1bd 100644 --- a/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb +++ b/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI[md5sum] = "8b39e07002f21c15d2a463b63d8a2952" SRC_URI[sha256sum] = "c1b17935207e9c4809feff91b679883928aa5bd3fce75e09b4945c261b513e60" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb b/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb index 2ba4b0e5..8184fb53 100644 --- a/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb +++ b/meta-openstack/recipes-devtools/python/python-tox_1.9.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d0fc2c2c954dc4d41043e67d4a8d8e7" SRC_URI[md5sum] = "f4db4d6a82d6a651e457ba55ef370258" SRC_URI[sha256sum] = "3125a15da7381f59f835a25bd259a84acb7a69858c81e386c50027bd842bb91b" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-trollius_git.bb b/meta-openstack/recipes-devtools/python/python-trollius_git.bb index 0ae4fef3..3e15f5f1 100644 --- a/meta-openstack/recipes-devtools/python/python-trollius_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trollius_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/haypo/${SRCNAME}.git;branch=trollius" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index e1f8ae0b..f1b6aacc 100755 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb @@ -14,7 +14,7 @@ SRCREV="11996635299396f181f5aec3c6825f8011d45e2c" PV="4.0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit update-rc.d setuptools identity hosts useradd default_configs +inherit update-rc.d setuptools3 identity hosts useradd default_configs SERVICECREATE_PACKAGES = "${SRCNAME}-setup" KEYSTONE_HOST="${CONTROLLER_IP}" diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb index e19ab4b6..64ab1669 100644 --- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb @@ -14,7 +14,7 @@ PV = "3.0.0+git${SRCPV}" SRCREV = "960843de8142db6e61cc4d148a51f55862acbba0" S = "${WORKDIR}/git" -inherit setuptools hosts default_configs rmargparse +inherit setuptools3 hosts default_configs rmargparse USERADD_PACKAGES = "${PN}" diff --git a/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb b/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb index 76d638a7..548543ea 100644 --- a/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb +++ b/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/jdunck/${BPN}.git" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 DEPENDS += " \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-uritemplate_3.0.0.bb b/meta-openstack/recipes-devtools/python/python-uritemplate_3.0.0.bb deleted file mode 100644 index 1e19ab96..00000000 --- a/meta-openstack/recipes-devtools/python/python-uritemplate_3.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-uritemplate.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-vine_1.1.4.bb b/meta-openstack/recipes-devtools/python/python-vine_1.1.4.bb deleted file mode 100644 index 01c2a95d..00000000 --- a/meta-openstack/recipes-devtools/python/python-vine_1.1.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools -require python-vine.inc - diff --git a/meta-openstack/recipes-devtools/python/python-virtualenv_1.11.4.bb b/meta-openstack/recipes-devtools/python/python-virtualenv_1.11.4.bb deleted file mode 100644 index f8b9d1c6..00000000 --- a/meta-openstack/recipes-devtools/python/python-virtualenv_1.11.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-virtualenv.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-voluptuous_0.10.5.bb b/meta-openstack/recipes-devtools/python/python-voluptuous_0.10.5.bb deleted file mode 100644 index d1970fb5..00000000 --- a/meta-openstack/recipes-devtools/python/python-voluptuous_0.10.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-voluptuous.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-warlock_1.3.3.bb b/meta-openstack/recipes-devtools/python/python-warlock_1.3.3.bb deleted file mode 100644 index 3358cec9..00000000 --- a/meta-openstack/recipes-devtools/python/python-warlock_1.3.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools -require python-warlock.inc - diff --git a/meta-openstack/recipes-devtools/python/python-weakrefmethod_1.0.3.bb b/meta-openstack/recipes-devtools/python/python-weakrefmethod_1.0.3.bb deleted file mode 100644 index be5d594e..00000000 --- a/meta-openstack/recipes-devtools/python/python-weakrefmethod_1.0.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-weakrefmethod.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb b/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb index 641caab2..c51a79b6 100644 --- a/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb +++ b/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a3b5f97c9d64189899b91b3728bfd774" SRC_URI[md5sum] = "8fa547ca4de84a96aa3472d55fbcdd59" SRC_URI[sha256sum] = "547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2" -inherit setuptools pypi +inherit setuptools3 pypi RDEPENDS_${PN} += "gmp" diff --git a/meta-openstack/recipes-devtools/python/python-webtest_2.0.33.bb b/meta-openstack/recipes-devtools/python/python-webtest_2.0.33.bb deleted file mode 100644 index 3a1fe90e..00000000 --- a/meta-openstack/recipes-devtools/python/python-webtest_2.0.33.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools pypi -require python-webtest.inc diff --git a/meta-openstack/recipes-devtools/python/python-wsgiref_0.1.2.bb b/meta-openstack/recipes-devtools/python/python-wsgiref_0.1.2.bb deleted file mode 100644 index 3ec8264e..00000000 --- a/meta-openstack/recipes-devtools/python/python-wsgiref_0.1.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-wsgiref.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-wsme_0.9.3.bb b/meta-openstack/recipes-devtools/python/python-wsme_0.9.3.bb deleted file mode 100644 index b332f5f1..00000000 --- a/meta-openstack/recipes-devtools/python/python-wsme_0.9.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools pypi -require python-wsme.inc diff --git a/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb b/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb index 65063e52..d349a48a 100644 --- a/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb +++ b/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb @@ -7,4 +7,4 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ebb582f22ddff5dcb0bc33d04f7cbb8" SRC_URI[md5sum] = "1bef31afb7038800f8d5cfa2f4562b37" SRC_URI[sha256sum] = "f9dcebc99555634b697fa3dad8ea3047deb389c6f1928d347a0c49277a5c0e9e" -inherit setuptools pypi
\ No newline at end of file +inherit setuptools3 pypi
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb index 414bfa83..622f1528 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb @@ -1,2 +1,2 @@ require python-xstatic-angular-bootstrap.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb index 0cf5aac2..ee9591a8 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb @@ -1,2 +1,2 @@ require python-xstatic-angular-cookies.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb index c2071739..644a6312 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb @@ -1,2 +1,2 @@ require python-xstatic-angular-fileupload.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb index 63aa60da..48b75aac 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb @@ -1,2 +1,2 @@ require python-xstatic-angular-gettext.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb index c41bdcdc..72c8781e 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb @@ -1,2 +1,2 @@ require python-xstatic-angular-irdragndrop.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb index 6deebd02..c754ef4f 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "LrDragNDrop javascript library packaged for setuptools" +DESCRIPTION = "LrDragNDrop javascript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-lrdragndrop" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-Angular-lrdragndrop" SRC_URI[md5sum] = "afd682cab9f436cf22b025dfcabaa225" SRC_URI[sha256sum] = "1cf04495981db5dfd5536441e17ec69bb18d624f847ddc203f3259d81b10a77e" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-mock_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-mock_1.2.1.1.bb index 0987fbbd..727d5b07 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-mock_1.2.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-mock_1.2.1.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Angular-Mock JavaScript library packaged for setuptools" +DESCRIPTION = "Angular-Mock JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Mock/" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-Angular-Mock" SRC_URI[md5sum] = "94f072c39c2070f3939b619d913fb37f" SRC_URI[sha256sum] = "ffee6edfab8276abd8057ddc28c4d8503424c0c61938e787720766862ef43e42" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb index 25c7626b..eae97b28 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb @@ -1,2 +1,2 @@ require python-xstatic-angular-schema-form.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb index 360fbfcf..8671b8b7 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Angular JavaScript library packaged for setuptools" +DESCRIPTION = "Angular JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-Angular" SRC_URI[md5sum] = "15384e734161d31ff18a644f9632f25b" SRC_URI[sha256sum] = "b1dcdd7a66d3041625698bba2ac480ffc2447b05f551f10fcae2ac33139eb033" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb index 0bea3f07..9e9db897 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb @@ -1,2 +1,2 @@ require python-xstatic-bootstrap-datepicker.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb index 314e25c6..20eab88c 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb @@ -1,2 +1,2 @@ require python-xstatic-bootstrap-scss.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb index 6e361984..5a7d5f8f 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb @@ -1,2 +1,2 @@ require python-xstatic-bootswatch.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb index ef3ca839..242175f1 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb @@ -1,2 +1,2 @@ require python-xstatic-d3.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb index cc342ac8..b2998f6e 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb @@ -1,2 +1,2 @@ require python-xstatic-font-awesome.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb index 9d571c51..bdd3c27c 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb @@ -1,2 +1,2 @@ require python-xstatic-hogan.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.4.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.4.1.1.bb deleted file mode 100644 index dc18f873..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jasmine_2.4.1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-jasmine.inc -inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb index f3a61461..2dab32f9 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb @@ -1,2 +1,2 @@ require python-xstatic-jquery-migrate.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb index e6aa481c..ca2d4471 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-jquery-ui" SRC_URI[md5sum] = "03d8ea7a0dab29d548e7bc195703b04f" SRC_URI[sha256sum] = "099b1836eb0d91b8dc98f5b8a6b856a2631d43af0d47f33ef90ee72ed37bda58" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb index ae3f5e06..295b3a40 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "JQuery.quicksearch JavaScript library packaged for setuptools " +DESCRIPTION = "JQuery.quicksearch JavaScript library packaged for setuptools3 " HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery.quicksearch" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-JQuery.quicksearch" SRC_URI[md5sum] = "0dc4bd1882cf35dc7b19a236ba09b89d" SRC_URI[sha256sum] = "1271571b420417add56c274fd935e81bfc79e0d54a03559d6ba5ef369f358477" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb index 0c4c524a..7ede3bff 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "JQuery.TableSorter JavaScript library packaged for setuptools" +DESCRIPTION = "JQuery.TableSorter JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery.TableSorter" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-JQuery.TableSorter" SRC_URI[md5sum] = "fc05a6731b6ac3f6489b893f96a5d29a" SRC_URI[sha256sum] = "3ba24aecd9a3dc71a79dd4096fa5a8a041c3a7b892c61d05e6e46de0605070f0" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb index 23cc65e2..efbb9e37 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb @@ -1,2 +1,2 @@ require python-xstatic-jquery.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb index 3ddcd89a..5c21816e 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "JSEncrypt JavaScript library packaged for setuptools" +DESCRIPTION = "JSEncrypt JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JSEncrypt" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-JSEncrypt" SRC_URI[md5sum] = "4b03331d4b2f6c12e2e4b8ee6056bda0" SRC_URI[sha256sum] = "a277912a4f70d1d2f58c8d94b992d244e69fcf851a2cbed5d83cb4fc422a72f2" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb index 4ff82947..06a5ffc7 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-Magic-Search" SRC_URI[md5sum] = "cfb8a82129fffbe1f5c6339240cb6139" SRC_URI[sha256sum] = "9b2f35a5792f4e763e6dc319036e3676f3e18f46153096f3ab5e507177ec007e" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-mdi_1.4.57.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-mdi_1.4.57.0.bb index 296e394f..9ea14733 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-mdi_1.4.57.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-mdi_1.4.57.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "mdi javascript library packaged for setuptools (easy_install) / pip." +DESCRIPTION = "mdi javascript library packaged for setuptools3 (easy_install) / pip." HOMEPAGE = "https://pypi.python.org/pypi/XStatic-mdi" SECTION = "devel/python" LICENSE = "Apache-2.0" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-mdi" SRC_URI[md5sum] = "f3d3d58603178e5898ee1ea4737826ee" SRC_URI[sha256sum] = "19b4d522f8fa62fee2893b39147fcf45ebaba8b95d63f3708ebdf34e130a8a53" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-objectpath_1.2.1.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-objectpath_1.2.1.0.bb index 3d256fde..bd2eefac 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-objectpath_1.2.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-objectpath_1.2.1.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "objectpath packaged for setuptools (easy_install) / pip." +DESCRIPTION = "objectpath packaged for setuptools3 (easy_install) / pip." HOMEPAGE = "https://pypi.python.org/pypi/XStatic-objectpath" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-objectpath" SRC_URI[md5sum] = "680a5e23a3d362db0b0721e5620dd6fc" SRC_URI[sha256sum] = "cd1e9f502482afcdd028821148843b07b4065c8dcea8e5cc33abb9ae1cf20b20" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-qunit_1.14.0.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-qunit_1.14.0.2.bb index f54d6b1a..014b004f 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-qunit_1.14.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-qunit_1.14.0.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "QUnit JavaScript library packaged for setuptools" +DESCRIPTION = "QUnit JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-QUnit" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-QUnit" SRC_URI[md5sum] = "21d48252d3301bd7ae530bfeffa3d108" SRC_URI[sha256sum] = "c5e2d68d55a3f62b1cfc586112099a522a0a2e2eb22533bbe5dff7d907249ee6" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-rickshaw_1.5.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-rickshaw_1.5.0.0.bb index 511e7ac1..f3698bff 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-rickshaw_1.5.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-rickshaw_1.5.0.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Rickshaw JavaScript library packaged for setuptools" +DESCRIPTION = "Rickshaw JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Rickshaw" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-Rickshaw" SRC_URI[md5sum] = "789fffdced10e93e10f75ce1ade6fc6c" SRC_URI[sha256sum] = "147574228757254442700a9eea5150f14acb1224ef0612f896b663ab58406de8" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb index 0f52a02c..e05e35ed 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb @@ -1,2 +1,2 @@ require python-xstatic-roboto-fontface.inc -inherit setuptools +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-smart-table_1.4.13.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-smart-table_1.4.13.2.bb index f6cf1c29..2430c8e3 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-smart-table_1.4.13.2.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-smart-table_1.4.13.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Angular JavaScript library packaged for setuptools" +DESCRIPTION = "Angular JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-smart-table" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-smart-table" SRC_URI[md5sum] = "21640f39d064ea292de9e8e7b33f9595" SRC_URI[sha256sum] = "f2fa5ed37c2953253de79c61c346fa6c3c4f38731295d2240552c14298db6b0a" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ python-pip \ diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-spin_1.2.5.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-spin_1.2.5.2.bb index 86c9ef68..4060bd96 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-spin_1.2.5.2.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-spin_1.2.5.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Spin JavaScript library packaged for setuptools" +DESCRIPTION = "Spin JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Spin" SECTION = "devel/python" LICENSE = "MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-Spin" SRC_URI[md5sum] = "df83f80fd0b11545b64497112996e49e" SRC_URI[sha256sum] = "7f46ef0e45e047019ba6eda22c432fb96f681b97bbe7f1749aa9209e07727192" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb index ef37760d..724fbda4 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Angular JavaScript library packaged for setuptools" +DESCRIPTION = "Angular JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-term.js/0.0.4.2" SECTION = "devel/python" LICENSE = "MIT" @@ -9,10 +9,10 @@ PYPI_PACKAGE = "XStatic-term.js" SRC_URI[md5sum] = "7434ecf6f5680c293cf3806245dc946b" SRC_URI[sha256sum] = "b5f3ab69cb638391f04254913a11b2aab08e2d51c5b81bb6a564c5a6d442bd31" -inherit setuptools pypi +inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " RDEPENDS_${PN} += " \ diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-tv4_1.2.7.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-tv4_1.2.7.0.bb index 6678c1b1..e1cdbbe2 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-tv4_1.2.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python-xstatic-tv4_1.2.7.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Tiny Validator packaged for setuptools (easy_install) / pip." +DESCRIPTION = "Tiny Validator packaged for setuptools3 (easy_install) / pip." HOMEPAGE = "https://pypi.python.org/pypi/XStatic-tv4" SECTION = "devel/python" LICENSE = "PD & MIT" @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic-tv4" SRC_URI[md5sum] = "921148dff35fb41431d5f122da570248" SRC_URI[sha256sum] = "9b4c57244e914126cdda5d8bc24698189d73800203c85b1fc945a08e25c7c713" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb b/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb index fc9499f0..68cb67b2 100644 --- a/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb +++ b/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=33573af7505a94ff3d122a7920b2c735" SRC_URI[md5sum] = "bd8db293a78c22171ecfdd54f4d65c63" SRC_URI[sha256sum] = "2e5bcb215e366e682fd05dd1df4f2e6affceefa5d3781c2987a21fd597659a21" -inherit setuptools pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip diff --git a/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb b/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb index 699d3803..47b28f30 100644 --- a/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb @@ -34,4 +34,4 @@ PV = "1.12.0+git${SRCPV}" SRCREV = "9038bf6ba93c24c9a61447dfcb14e436f1267066" S = "${WORKDIR}/git" -inherit setuptools +inherit setuptools3 |