[meta-virtualization] [PATCH] python3-os-traits: change to python3

[meta-virtualization] [PATCH] python3-os-traits: change to python3

[zangrc]

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python-os-traits_git.bb            | 29 -------------------
 .../python/python3-os-traits_2.4.0.bb         | 22 ++++++++++++++
 2 files changed, 22 insertions(+), 29 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-os-traits_git.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb b/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
deleted file mode 100644
index 70b7b69..0000000
--- a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "OpenStack library containing standardized trait strings."
-HOMEPAGE = "https://github.com/openstack/os-traits"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI = "\
-	git://github.com/openstack/os-traits.git;branch=stable/pike \
-	"
-
-PV = "0.3.3+git${SRCPV}"
-SRCREV = "3e8b4a77aaf2d8b64f89ba3b479113d0b44bbe2f"
-S = "${WORKDIR}/git"
-
-inherit setuptools3
-
-DEPENDS += " \
-        python-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python-pbr-native \
-	"
-
-RDEPENDS_${PN} += " \
-        python-pbr \
-        python-six \
-	"
diff --git a/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
new file mode 100644
index 0000000..72bd1b2
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "OpenStack library containing standardized trait strings."
+HOMEPAGE = "https://github.com/openstack/os-traits"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+SRC_URI[sha256sum] = "af1df9485a3119c2a6647639c8bb8bb852cb839ad9c12fa1d9e72f402c66af49"
+
+inherit setuptools3 pypi
+
+DEPENDS += " \
+        python3-pbr \
+        "
+
+DEPENDS += " \
+        python3-pbr-native \
+	"
+
+RDEPENDS_${PN} += " \
+        python3-pbr \
+        python3-six \
+	"
-- 
2.25.1

[meta-virtualization] [PATCH] python3-pika-pool: Remove python recipe

[zangrc]

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python-pika-pool.inc                 | 15 ---------------
 .../python/python-pika-pool_0.1.3.bb            |  2 --
 .../python/python3-pika-pool_0.1.3.bb           | 17 +++++++++++++++--
 3 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-pika-pool.inc
 delete mode 100644 meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb

diff --git a/meta-openstack/recipes-devtools/python/python-pika-pool.inc b/meta-openstack/recipes-devtools/python/python-pika-pool.inc
deleted file mode 100644
index c87d744..0000000
--- a/meta-openstack/recipes-devtools/python/python-pika-pool.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "pools for your pikas"
-HOMEPAGE = "https://github.com/bninja/pika-pool"
-SECTION = "devel/python"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-SRC_URI[md5sum] = "0a3897e991aa3da948e03660313c1980"
-SRC_URI[sha256sum] = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397"
-
-inherit pypi
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-pika \
-    "
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
deleted file mode 100644
index 049e521..0000000
--- a/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3 
-require python-pika-pool.inc
diff --git a/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb b/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb
index 049e521..b9d36ec 100644
--- a/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb
@@ -1,2 +1,15 @@
-inherit setuptools3 
-require python-pika-pool.inc
+SUMMARY = "pools for your pikas"
+HOMEPAGE = "https://github.com/bninja/pika-pool"
+SECTION = "devel/python"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
+
+SRC_URI[md5sum] = "0a3897e991aa3da948e03660313c1980"
+SRC_URI[sha256sum] = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397"
+
+inherit setuptools3 pypi
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-pika \
+    "
-- 
2.25.1

[meta-virtualization] [PATCH] python3-posix-ipc: Remove python recipe

[zangrc]

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python-posix-ipc.inc               | 25 -----------------
 .../python/python-posix-ipc_1.0.4.bb          |  2 --
 .../python/python3-posix-ipc_1.0.4.bb         | 27 +++++++++++++++++--
 3 files changed, 25 insertions(+), 29 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-posix-ipc.inc
 delete mode 100644 meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb

diff --git a/meta-openstack/recipes-devtools/python/python-posix-ipc.inc b/meta-openstack/recipes-devtools/python/python-posix-ipc.inc
deleted file mode 100644
index 32557f0..0000000
--- a/meta-openstack/recipes-devtools/python/python-posix-ipc.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python"
-HOMEPAGE = "http://semanchuk.com/philip/posix_ipc/"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dc089fb2f37e90799a54c19a20c9880f"
-
-PYPI_PACKAGE = "posix_ipc"
-
-# Archived version so we need to overwrite what the pypi class will derive
-PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "c4fd0065244ccb2f59cb8ceedf287cf6"
-SRC_URI[sha256sum] = "ff6c9077633fc62a491d6997c43b094d885bb45a7ca1f36c9a0d647c54b74b14"
-
-inherit pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        "
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
deleted file mode 100644
index 9e79b1c..0000000
--- a/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3
-require python-posix-ipc.inc
diff --git a/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb
index 9e79b1c..2e8dca0 100644
--- a/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb
@@ -1,2 +1,25 @@
-inherit setuptools3
-require python-posix-ipc.inc
+DESCRIPTION = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python"
+HOMEPAGE = "http://semanchuk.com/philip/posix_ipc/"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dc089fb2f37e90799a54c19a20c9880f"
+
+PYPI_PACKAGE = "posix_ipc"
+
+# Archived version so we need to overwrite what the pypi class will derive
+PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "c4fd0065244ccb2f59cb8ceedf287cf6"
+SRC_URI[sha256sum] = "ff6c9077633fc62a491d6997c43b094d885bb45a7ca1f36c9a0d647c54b74b14"
+
+inherit setuptools3 pypi
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        "
-- 
2.25.1

[meta-virtualization] [PATCH] python3-pytest-salt: upgrade 2017.7.0 -> 2020.1.27

[zangrc]

-License-Update: Change to a PKG-INFO file containing licenses information.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python-pytest-salt.inc             | 21 -------------------
 .../python/python-pytest-salt_2017.7.0.bb     |  2 --
 .../python/python3-pytest-salt_2017.7.0.bb    |  2 --
 .../python/python3-pytest-salt_2020.1.27.bb   | 17 +++++++++++++++
 4 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-pytest-salt.inc
 delete mode 100644 meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb

diff --git a/meta-openstack/recipes-devtools/python/python-pytest-salt.inc b/meta-openstack/recipes-devtools/python/python-pytest-salt.inc
deleted file mode 100644
index 1f82763..0000000
--- a/meta-openstack/recipes-devtools/python/python-pytest-salt.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "This pytest plugin will allow the Salt Daemons to be used in tests."
-HOMEPAGE = "https://github.com/saltstack/pytest-salt"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-
-SRCNAME = "pytest-salt"
-SRC_URI = "git://github.com/saltstack/${SRCNAME}.git;branch=master"
-
-SRC_URI[md5sum] = "c598d7db87ea52cdeb067d7596b3b0b1"
-SRC_URI[sha256sum] = "7052459cda9fbdbbfff9a25b24243b0b96cf56835a2c41135d754cc5b65e2494"
-
-SRCREV = "feb5031f80cf84b113ebe69543cdd44b6a373d21"
-S = "${WORKDIR}/git"
-
-RDEPENDS_${PN} = " \
-    ${PYTHON_PN}-pytest \
-    ${PYTHON_PN}-pytest-tempdir \
-    ${PYTHON_PN}-pytest-helpers-namespace \
-    ${PYTHON_PN}-psutil \
-    "
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
deleted file mode 100644
index 4e33265..0000000
--- a/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require python-pytest-salt.inc
-inherit setuptools3
diff --git a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb
deleted file mode 100644
index 4e33265..0000000
--- a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require python-pytest-salt.inc
-inherit setuptools3
diff --git a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb
new file mode 100644
index 0000000..f8a19e7
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb
@@ -0,0 +1,17 @@
+SUMMARY = "This pytest plugin will allow the Salt Daemons to be used in tests."
+HOMEPAGE = "https://github.com/saltstack/pytest-salt"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5da5421b61b52c332140da3f2e10e40a"
+
+SRC_URI[md5sum] = "3d6e5d10f7c16abcfbc176b5dbb6ad36"
+SRC_URI[sha256sum] = "fcc29c9e8208eda8955367c11607e72467a68564d5afbcf632b1dd6ecfbe55a1"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} = " \
+    ${PYTHON_PN}-pytest \
+    ${PYTHON_PN}-pytest-tempdir \
+    ${PYTHON_PN}-pytest-helpers-namespace \
+    ${PYTHON_PN}-psutil \
+    "
-- 
2.25.1

Re: [meta-virtualization] [PATCH] python3-os-traits: change to python3

[Bruce Ashfield]

Merged!

Bruce



In message: [meta-virtualization] [PATCH] python3-os-traits: change to python3
on 04/08/2020 zangrc wrote:

> Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
> ---
>  .../python/python-os-traits_git.bb            | 29 -------------------
>  .../python/python3-os-traits_2.4.0.bb         | 22 ++++++++++++++
>  2 files changed, 22 insertions(+), 29 deletions(-)
>  delete mode 100644 meta-openstack/recipes-devtools/python/python-os-traits_git.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
> 
> diff --git a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb b/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
> deleted file mode 100644
> index 70b7b69..0000000
> --- a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -DESCRIPTION = "OpenStack library containing standardized trait strings."
> -HOMEPAGE = "https://github.com/openstack/os-traits"
> -SECTION = "devel/python"
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
> -
> -SRC_URI = "\
> -	git://github.com/openstack/os-traits.git;branch=stable/pike \
> -	"
> -
> -PV = "0.3.3+git${SRCPV}"
> -SRCREV = "3e8b4a77aaf2d8b64f89ba3b479113d0b44bbe2f"
> -S = "${WORKDIR}/git"
> -
> -inherit setuptools3
> -
> -DEPENDS += " \
> -        python-pbr \
> -        "
> -
> -# Satisfy setup.py 'setup_requires'
> -DEPENDS += " \
> -        python-pbr-native \
> -	"
> -
> -RDEPENDS_${PN} += " \
> -        python-pbr \
> -        python-six \
> -	"
> diff --git a/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
> new file mode 100644
> index 0000000..72bd1b2
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb
> @@ -0,0 +1,22 @@
> +DESCRIPTION = "OpenStack library containing standardized trait strings."
> +HOMEPAGE = "https://github.com/openstack/os-traits"
> +SECTION = "devel/python"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
> +
> +SRC_URI[sha256sum] = "af1df9485a3119c2a6647639c8bb8bb852cb839ad9c12fa1d9e72f402c66af49"
> +
> +inherit setuptools3 pypi
> +
> +DEPENDS += " \
> +        python3-pbr \
> +        "
> +
> +DEPENDS += " \
> +        python3-pbr-native \
> +	"
> +
> +RDEPENDS_${PN} += " \
> +        python3-pbr \
> +        python3-six \
> +	"
> -- 
> 2.25.1
> 
> 
> 

>