[meta-virtualization] [PATCH 1/5] python3-dogpile.cache: ADD RDEPENDS

[meta-virtualization] [PATCH 1/5] python3-dogpile.cache: ADD RDEPENDS

[zangrc]

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../recipes-devtools/python/python3-dogpile.cache_1.0.2.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.0.2.bb
index 82057a6c..21b596fc 100644
--- a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.0.2.bb
@@ -9,6 +9,11 @@ SRC_URI[sha256sum] = "64fda39d25b46486a4876417ca03a4af06f35bfadba9f59613f9b3d748
 
 inherit setuptools3 pypi
 
-RDEPENDS_${PN} += "python3-decorator"
+RDEPENDS_${PN} += " \
+	python3-decorator \
+	python3-logging \
+	python3-numbers \
+	python3-stevedore \
+"
 
 
-- 
2.25.1

[meta-virtualization] [PATCH 2/5] python3-munch: Add recipe

[zangrc]

Append python3-munch because it is dependent on python3-openstacksdk runtime.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python3-munch_2.5.0.bb             | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb b/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb
new file mode 100644
index 00000000..58f40d00
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "munch is a fork of David Schoonover's Bunch package, providing similar functionality"
+HOMEPAGE = "https://pypi.org/project/munch/"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0291cd32b2d6a91d9b19970c94d0a46"
+
+SRC_URI[md5sum] = "ed84c3718416c8d4d03d0a6ef46e8e0c"
+SRC_URI[sha256sum] = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"
+
+inherit setuptools3 pypi
+
+DEPENDS += " \
+	python3-pbr-native \
+"
+
+RDEPENDS_${PN} += " \
+	python3-pkg-resources \
+	python3-six \
+"
-- 
2.25.1

[meta-virtualization] [PATCH 3/5] python3-jmespath: Add recipe

[zangrc]

Append python3-jmespath because it is dependent on python3-openstacksdk runtime.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python3-jmespath_0.10.0.bb            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb b/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb
new file mode 100644
index 00000000..3a9a8e6f
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "JSON Matching Expressions"
+HOMEPAGE = "https://pypi.org/project/jmespath/"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4"
+
+SRC_URI[md5sum] = "65bdcb5fa5bcf1cc710ffa508e78e408"
+SRC_URI[sha256sum] = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"
+
+inherit setuptools3 pypi
+
+RDEPENDS_${PN} += " \
+	python3-math \
+	python3-json \
+	python3-numbers \
+"
-- 
2.25.1

[meta-virtualization] [PATCH 4/5] python3-os-service-types: Add recipe

[zangrc]

Append python3-os-service-types because it is dependent on python3-openstacksdk runtime.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python3-os-service-types_1.7.0.bb    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb b/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb
new file mode 100644
index 00000000..a686d6aa
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Python library for consuming OpenStack sevice-types-authority data"
+HOMEPAGE = "https://pypi.org/project/os-service-types/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+SRC_URI[sha256sum] = "31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c"
+
+inherit setuptools3 pypi
+
+DEPENDS += " \
+	python3-pbr-native \
+        "
+
+RDEPENDS_${PN} += " \
+	python3-pbr \
+	"
-- 
2.25.1

[meta-virtualization] [PATCH 5/5] python3-openstacksdk: Change to python3

[zangrc]

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

diff --git a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb
deleted file mode 100644
index 3e52d0e2..00000000
--- a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Unified SDK for OpenStack"
-HOMEPAGE = "https://github.com/openstack/python-openstacksdk"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRC_URI = " \
-        git://github.com/openstack/python-openstacksdk.git;branch=master \
-        "
-
-PV = "0.9.19+git${SRCPV}"
-SRCREV = "bd60aa4a21676b8901691298eb0786fc231f7bff"
-S = "${WORKDIR}/git"
-
-inherit setuptools3
-
-DEPENDS += "\
-        python-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python-pbr-native \
-	"
-
-RDEPENDS_${PN} += " \
-        python-pbr \
-        python-jsonpatch \
-        python-six \
-        python-stevedore \
-        python-os-client-config \
-        python-keystoneauth1 \
-        python-deprecation \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
new file mode 100644
index 00000000..7c148187
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "Unified SDK for OpenStack"
+HOMEPAGE = "https://github.com/openstack/python-openstacksdk"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRC_URI = " \
+        git://github.com/openstack/python-openstacksdk.git;branch=master \
+        "
+
+PV = "0.52.0+git${SRCPV}"
+SRCREV = "e169c495de39a2d97ef1d8bb7894b18e4ef268dd"
+S = "${WORKDIR}/git"
+
+inherit setuptools3
+
+DEPENDS += "\
+        python3-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        python3-pbr-native \
+	"
+
+RDEPENDS_${PN} += " \
+        python3-pbr \
+        bash \
+        python3-jsonpatch \
+        python3-six \
+        python3-stevedore \
+        python3-os-client-config \
+        python3-keystoneauth1 \
+        python3-deprecation \
+        python3-os-service-types \
+        python3-munch \
+        python3-jmespath \
+        python3-netifaces \
+        python3-decorator \
+        python3-dogpile.cache \
+        "
-- 
2.25.1

[meta-virtualization] [PATCH] python3-salttesting: upgrade 2015.2.16 -> 2018.9.21

[zangrc]

Refresh the following patch:
0001-Add-ptest-output-option-to-test-suite.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../python/python-salttesting_2015.2.16.bb    | 24 -------------------
 ...dd-ptest-output-option-to-test-suite.patch | 24 ++++++++++---------
 .../python/python3-salttesting_git.bb         | 20 ++++++++++++++++
 3 files changed, 33 insertions(+), 35 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb
 rename meta-openstack/recipes-devtools/python/{python-salttesting => python3-salttesting}/0001-Add-ptest-output-option-to-test-suite.patch (94%)
 create mode 100644 meta-openstack/recipes-devtools/python/python3-salttesting_git.bb

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
deleted file mode 100644
index d5d1e3e4..00000000
--- a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Common testing tools used in the Salt Stack projects"
-HOMEPAGE = "https://github.com/saltstack/salt-testing"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5"
-SRCNAME = "salt-testing"
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
-
-SRC_URI = "https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz;downloadfilename=salt-testing-v${PV}.tar.gz \
-           file://0001-Add-ptest-output-option-to-test-suite.patch \
-           "
-SRC_URI[md5sum] = "8ca55a796e9ad7ba72bc143043753ccf"
-SRC_URI[sha256sum] = "0ef4be6a8a9b505ae1c328394dfad50493674af6100c7e2c220f374533d86edc"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-RDEPENDS_${PN} = "\
-                  python-mock \
-                  python-unittest \
-"
-
-inherit setuptools3
-
diff --git a/meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch b/meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
similarity index 94%
rename from meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
rename to meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
index e86768a1..f1628a3d 100644
--- a/meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch
@@ -1,6 +1,6 @@
-From 1950b943b7173198f345a1cff7b7f771cbac2244 Mon Sep 17 00:00:00 2001
-From: Collin Richards <collin.richards@ni.com>
-Date: Tue, 28 Jun 2016 16:02:22 -0500
+From 61ba63c3cde920873b8df48b950b8ebb79158346 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@cn.fujitsu.com>
+Date: Thu, 19 Nov 2020 11:20:58 +0900
 Subject: [PATCH] Add ptest output option to test suite
 
 Extend salttesting to support outputing the results of running the test
@@ -9,26 +9,28 @@ suite in ptest format.
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Collin Richards <collin.richards@ni.com>
+Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
+
 Natinst-ReviewBoard-ID: 143279
 ---
  salttesting/parser/__init__.py |  12 +++
- salttesting/ptest.py           | 165 +++++++++++++++++++++++++++++++++++++++++
+ salttesting/ptest.py           | 165 +++++++++++++++++++++++++++++++++
  2 files changed, 177 insertions(+)
  create mode 100644 salttesting/ptest.py
 
 diff --git a/salttesting/parser/__init__.py b/salttesting/parser/__init__.py
-index 1e7275b..d8cba0c 100644
+index d752acf..b41e5ea 100644
 --- a/salttesting/parser/__init__.py
 +++ b/salttesting/parser/__init__.py
-@@ -25,6 +25,7 @@ from functools import partial
- from contextlib import closing
+@@ -28,6 +28,7 @@ from contextlib import closing
  
+ import six
  from salttesting import TestLoader, TextTestRunner
 +from salttesting.ptest import PTestRunner
+ from salttesting import helpers
  from salttesting.version import __version_info__
  from salttesting.xmlunit import HAS_XMLRUNNER, XMLTestRunner
- try:
-@@ -264,6 +265,12 @@ class SaltTestingParser(optparse.OptionParser):
+@@ -277,6 +278,12 @@ class SaltTestingParser(optparse.OptionParser):
              action='store_true',
              help='Do NOT show the overall tests result'
          )
@@ -41,7 +43,7 @@ index 1e7275b..d8cba0c 100644
          self.add_option_group(self.output_options_group)
  
          self.fs_cleanup_options_group = optparse.OptionGroup(
-@@ -491,6 +498,11 @@ class SaltTestingParser(optparse.OptionParser):
+@@ -531,6 +538,11 @@ class SaltTestingParser(optparse.OptionParser):
                  verbosity=self.options.verbosity
              ).run(tests)
              self.testsuite_results.append((header, runner))
@@ -225,5 +227,5 @@ index 0000000..4c50f57
 +        self.stream.writeln()
 +        return result
 -- 
-2.13.2
+2.25.1
 
diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
new file mode 100644
index 00000000..34476219
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Common testing tools used in the Salt Stack projects"
+HOMEPAGE = "https://github.com/saltstack/salt-testing"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5"
+
+SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop;tag=v2018.9.21 \
+           file://0001-Add-ptest-output-option-to-test-suite.patch \
+           "
+
+PV = "2018.9.21+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "\
+                  python3-mock \
+                  python3-unittest \
+"
+
+inherit setuptools3
-- 
2.25.1

[meta-virtualization] [PATCH] python-mox: Remove recipe

[zangrc]

This package only supports python2.

New uses of this library are discouraged.

People are encouraged to use https://pypi.python.org/pypi/mock instead which matches the unittest.mock library available in Python 3.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 .../recipes-devtools/python/python-mox_0.5.3.bb   | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb

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
deleted file mode 100644
index bdd5fbee..00000000
--- a/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Mock object framework"
-HOMEPAGE = "https://github.com/dreamhost/cliff"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI[md5sum] = "6de7371e7e8bd9e2dad3fef2646f4a43"
-SRC_URI[sha256sum] = "424ee725ee12652802b4e86571f816059b0d392401ceae70bf6487d65602cba9"
-
-inherit distutils3 pypi
-
-DISTUTILS_INSTALL_ARGS = "--root=${D} \
-    --prefix=${prefix} \
-    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
-    --install-data=${datadir}"
-- 
2.25.1

Re: [meta-virtualization] [PATCH] python-mox: Remove recipe

[Bruce Ashfield]

merged.

Bruce

In message: [meta-virtualization] [PATCH] python-mox: Remove recipe
on 23/11/2020 zangrc wrote:

> This package only supports python2.
> 
> New uses of this library are discouraged.
> 
> People are encouraged to use https://pypi.python.org/pypi/mock instead which matches the unittest.mock library available in Python 3.
> 
> Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
> ---
>  .../recipes-devtools/python/python-mox_0.5.3.bb   | 15 ---------------
>  1 file changed, 15 deletions(-)
>  delete mode 100644 meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb
> 
> 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
> deleted file mode 100644
> index bdd5fbee..00000000
> --- a/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -DESCRIPTION = "Mock object framework"
> -HOMEPAGE = "https://github.com/dreamhost/cliff"
> -SECTION = "devel/python"
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
> -
> -SRC_URI[md5sum] = "6de7371e7e8bd9e2dad3fef2646f4a43"
> -SRC_URI[sha256sum] = "424ee725ee12652802b4e86571f816059b0d392401ceae70bf6487d65602cba9"
> -
> -inherit distutils3 pypi
> -
> -DISTUTILS_INSTALL_ARGS = "--root=${D} \
> -    --prefix=${prefix} \
> -    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
> -    --install-data=${datadir}"
> -- 
> 2.25.1
> 
> 
> 

> 
> 
>