[meta-virtualization] [PATCH 1/7] python3-pyscss: Change to python3

[meta-virtualization] [PATCH 1/7] python3-pyscss: Change to python3

[zhengruoqin]

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 ...thon-pyscss_1.3.4.bb => python3-pyscss_1.3.7.bb} | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-pyscss_1.3.4.bb => python3-pyscss_1.3.7.bb} (61%)

diff --git a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb b/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb
similarity index 61%
rename from meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb
rename to meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb
index 60e300de..0c7528a5 100644
--- a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb
@@ -6,22 +6,25 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=28155276e8df3f75bbd327335f66f2fa"
 
 PYPI_PACKAGE = "pyScss"
 
-SRC_URI[md5sum] = "9527b4864cd6023f77a8277e6fb773d7"
-SRC_URI[sha256sum] = "d0323110ecc7d3ead6b99cfec31301306928130e4d0a9eb13226bf390aba8c0e"
+SRC_URI[md5sum] = "c75fa4ea88d3c9df57a11679f337a939"
+SRC_URI[sha256sum] = "f1df571569021a23941a538eb154405dde80bed35dc1ea7c5f3e18e0144746bf"
 
 inherit setuptools3 pypi
 
 # DEPENDS_default: python-pip
 
 DEPENDS += " \
-        python-pip \
+        python3-pip \
         libpcre \
-        python-six \
+        python3-six \
         "
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
-        python-enum \
+	python3-logging \
+	python3-six \
+	python3-numbers \
+	python3-image \
         "
 
 CLEANBROKEN = "1"
-- 
2.25.1

[meta-virtualization] [PATCH 2/7] python3-httpretty: change RDEPENDS

[zhengruoqin]

Because python3 no longer provides python3-typing package, so modify RDEPENDS.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 .../recipes-devtools/python/python3-httpretty_1.0.2.bb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.2.bb
index 0b8f1927..07427460 100644
--- a/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.2.bb
@@ -20,5 +20,5 @@ RDEPENDS_${PN} = " \
 	${PYTHON_PN}-crypt \
 	${PYTHON_PN}-logging \
 	${PYTHON_PN}-json \
-	${PYTHON_PN}-typing \
+	${PYTHON_PN}-core \
 "
-- 
2.25.1

[meta-virtualization] [PATCH 3/7] python3-repoze.lru: change RDEPENDS

[zhengruoqin]

Because python3 no longer provides python3-typing package, so modify RDEPENDS.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 .../recipes-devtools/python/python3-repoze.lru_0.7.bb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb b/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb
index e709bd71..0f782eea 100644
--- a/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb
+++ b/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb
@@ -14,5 +14,5 @@ SRC_URI[sha256sum] = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db8
 inherit setuptools3 pypi
 
 RDEPENDS_${PN} += " \
-	python3-typing \
+	python3-netclient \
 "
-- 
2.25.1

[meta-virtualization] [PATCH 4/7] python3-paste: remove RDEPENDS

[zhengruoqin]

Because python3 no longer provides python3-typing package, it is removed from RDEPENDS.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb b/meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb
index 2be69ea2..086766d4 100644
--- a/meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb
@@ -10,7 +10,3 @@ SRC_URI[md5sum] = "90c56e0f84c58ca4841c0df0bcfc11d9"
 SRC_URI[sha256sum] = "1b095c42dc91d426f3ae85101796b14d265887f8f36f3aad143a5f29effdc39d"
 
 inherit setuptools3 pypi
-
-RDEPENDS_${PN} += " \
-	python3-typing \
-"
-- 
2.25.1

[meta-virtualization] [PATCH 5/7] python3-django-pyscss: Change to python3

[zhengruoqin]

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 ...ngo-pyscss_2.0.2.bb => python3-django-pyscss_2.0.2.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-django-pyscss_2.0.2.bb => python3-django-pyscss_2.0.2.bb} (82%)

diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
similarity index 82%
rename from meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
rename to meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
index 7438327b..0d6cc417 100644
--- a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
@@ -12,12 +12,12 @@ inherit setuptools3 pypi
 # DEPENDS_default: python-pip
 
 DEPENDS += " \
-        python-pip \
+        python3-pip \
         "
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
-        python-django \
-        python-pyscss \        
-        python-pathlib \
+        python3-django \
+        python3-pyscss \        
+        python3-pathlib \
         "
-- 
2.25.1

[meta-virtualization] [PATCH 6/7] python3-glance-store: Change to python3

[zhengruoqin]

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 ...ore_git.bb => python3-glance-store_git.bb} | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-glance-store_git.bb => python3-glance-store_git.bb} (53%)

diff --git a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
similarity index 53%
rename from meta-openstack/recipes-devtools/python/python-glance-store_git.bb
rename to meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
index 1a8c3aab..50799580 100644
--- a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
@@ -15,28 +15,29 @@ S = "${WORKDIR}/git"
 inherit setuptools3
 
 DEPENDS += " \
-        python-pip \
-        python-pbr \
+        python3-pip \
+        python3-pbr \
         "
 
 # Satisfy setup.py 'setup_requires'
 DEPENDS += " \
-        python-pbr-native \
+        python3-pbr-native \
         "
 
 RDEPENDS_${PN} += " \
         bash \
-        python-oslo.config \
-        python-oslo.i18n \
-        python-oslo.serialization \
-        python-oslo.utils \
-        python-oslo.concurrency \
-        python-stevedore \
-        python-enum34 \
-        python-eventlet \
-        python-six \
-        python-jsonschema \
-        python-keystoneauth1 \
-        python-keystoneclient \
-        python-requests \
+        python3-oslo.config \
+        python3-oslo.i18n \
+        python3-oslo.serialization \
+        python3-oslo.utils \
+        python3-oslo.concurrency \
+        python3-stevedore \
+        python3-eventlet \
+        python3-six \
+        python3-jsonschema \
+        python3-keystoneauth1 \
+        python3-keystoneclient \
+        python3-requests \
+        python3-monotonic \
+        python3-dnspython \
         "
-- 
2.25.1

[meta-virtualization] [PATCH 7/7] python3-osprofiler: upgrade 2.9.0 -> 3.4.0

[zhengruoqin]

Because python2 is no longer maintained, bb file is changed to python3 version.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 .../python/python-osprofiler_2.9.0.bb         | 35 -------------------
 .../python/python3-osprofiler_3.4.0.bb        | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb

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
deleted file mode 100644
index e6fe8656..00000000
--- a/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "OpenStack Profiler Library"
-HOMEPAGE = "http://www.openstack.org/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5"
-
-SRC_URI[md5sum] = "75f190b00ac248b3d547b67a480801db"
-SRC_URI[sha256sum] = "6915cbf8ac390dc3e125340b0ff368dd53f5889e3d053f9122dd83ba0dd366f7"
-
-inherit setuptools3 pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        python-pip \
-        python-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        python-pbr-native \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        python-pbr \
-        python-six \
-        python-oslo.messaging \
-        python-oslo.log \
-        python-oslo.utils \
-        python-webob \
-        python-requests \
-        python-netaddr \
-        python-oslo.concurrency \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
new file mode 100644
index 00000000..5d7939b6
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "OpenStack Profiler Library"
+HOMEPAGE = "http://www.openstack.org/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5"
+
+SRC_URI[md5sum] = "691c4d2cc77e60eeaa30edd7bf087481"
+SRC_URI[sha256sum] = "f7fe387f4dd681bbf92b9fbe857cc90e89cfe96d44522a2727540902310a9ed6"
+
+inherit setuptools3 pypi
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        python3-pip \
+        python3-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        python3-pbr-native \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        python3-pbr \
+        python3-six \
+        python3-oslo.messaging \
+        python3-oslo.log \
+        python3-oslo.utils \
+        python3-webob \
+        python3-requests \
+        python3-netaddr \
+        python3-oslo.concurrency \
+        "
-- 
2.25.1

Re: [meta-virtualization] [PATCH 7/7] python3-osprofiler: upgrade 2.9.0 -> 3.4.0

[Bruce Ashfield]

merged.

Bruce

In message: [meta-virtualization] [PATCH 7/7] python3-osprofiler: upgrade 2.9.0 -> 3.4.0
on 15/12/2020 zhengruoqin wrote:

> Because python2 is no longer maintained, bb file is changed to python3 version.
> 
> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
> ---
>  .../python/python-osprofiler_2.9.0.bb         | 35 -------------------
>  .../python/python3-osprofiler_3.4.0.bb        | 35 +++++++++++++++++++
>  2 files changed, 35 insertions(+), 35 deletions(-)
>  delete mode 100644 meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
> 
> 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
> deleted file mode 100644
> index e6fe8656..00000000
> --- a/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -DESCRIPTION = "OpenStack Profiler Library"
> -HOMEPAGE = "http://www.openstack.org/"
> -SECTION = "devel/python"
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5"
> -
> -SRC_URI[md5sum] = "75f190b00ac248b3d547b67a480801db"
> -SRC_URI[sha256sum] = "6915cbf8ac390dc3e125340b0ff368dd53f5889e3d053f9122dd83ba0dd366f7"
> -
> -inherit setuptools3 pypi
> -
> -# DEPENDS_default: python-pip
> -
> -DEPENDS += " \
> -        python-pip \
> -        python-pbr \
> -        "
> -
> -# Satisfy setup.py 'setup_requires'
> -DEPENDS += " \
> -        python-pbr-native \
> -        "
> -
> -# RDEPENDS_default: 
> -RDEPENDS_${PN} += " \
> -        python-pbr \
> -        python-six \
> -        python-oslo.messaging \
> -        python-oslo.log \
> -        python-oslo.utils \
> -        python-webob \
> -        python-requests \
> -        python-netaddr \
> -        python-oslo.concurrency \
> -        "
> diff --git a/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
> new file mode 100644
> index 00000000..5d7939b6
> --- /dev/null
> +++ b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb
> @@ -0,0 +1,35 @@
> +DESCRIPTION = "OpenStack Profiler Library"
> +HOMEPAGE = "http://www.openstack.org/"
> +SECTION = "devel/python"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5"
> +
> +SRC_URI[md5sum] = "691c4d2cc77e60eeaa30edd7bf087481"
> +SRC_URI[sha256sum] = "f7fe387f4dd681bbf92b9fbe857cc90e89cfe96d44522a2727540902310a9ed6"
> +
> +inherit setuptools3 pypi
> +
> +# DEPENDS_default: python-pip
> +
> +DEPENDS += " \
> +        python3-pip \
> +        python3-pbr \
> +        "
> +
> +# Satisfy setup.py 'setup_requires'
> +DEPENDS += " \
> +        python3-pbr-native \
> +        "
> +
> +# RDEPENDS_default: 
> +RDEPENDS_${PN} += " \
> +        python3-pbr \
> +        python3-six \
> +        python3-oslo.messaging \
> +        python3-oslo.log \
> +        python3-oslo.utils \
> +        python3-webob \
> +        python3-requests \
> +        python3-netaddr \
> +        python3-oslo.concurrency \
> +        "
> -- 
> 2.25.1
> 
> 
> 

> 
> 
> 

[meta-virtualization] [PATCH 5/7] python3-django-pyscss: Change to python3

[zhengruoqin]

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 ...ngo-pyscss_2.0.2.bb => python3-django-pyscss_2.0.2.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-django-pyscss_2.0.2.bb => python3-django-pyscss_2.0.2.bb} (82%)

diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
similarity index 82%
rename from meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
rename to meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
index 7438327b..0d6cc417 100644
--- a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb
@@ -12,12 +12,12 @@ inherit setuptools3 pypi
 # DEPENDS_default: python-pip
 
 DEPENDS += " \
-        python-pip \
+        python3-pip \
         "
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
-        python-django \
-        python-pyscss \        
-        python-pathlib \
+        python3-django \
+        python3-pyscss \        
+        python3-pathlib \
         "
-- 
2.25.1