Skip to contentSkip to conversation

python3-oslo.utils: Remove inc file

PATCH In review Wang Mingyu 2 participants 5 messages Jun 28, 2020 – Jun 30, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 python3-oslo.utils: Remove inc file

---
 .../python/python-oslo.utils.inc              | 37 ------------------
 .../python/python3-oslo.utils_git.bb          | 38 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 38 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-oslo.utils.inc
meta-openstack/recipes-devtools/python/python-oslo.utils.inc deleted +0 -37
deleted file mode 100644
index 8c3022d..0000000
@@ -1,37 +0,0 @@
-DESCRIPTION = "Oslo utils"
-HOMEPAGE = "https://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCNAME = "oslo.utils"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike"
-
-PV = "3.28.0+git${SRCPV}"
-SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c"
-S = "${WORKDIR}/git"
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        ${PYTHON_PN}-pbr \
-        "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
-        ${PYTHON_PN}-pbr-native \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        ${PYTHON_PN}-pbr \
-        ${PYTHON_PN}-six \
-        ${PYTHON_PN}-iso8601 \
-        ${PYTHON_PN}-oslo.i18n \
-        ${PYTHON_PN}-pytz \
-        ${PYTHON_PN}-netaddr \
-        ${PYTHON_PN}-netifaces \
-        ${PYTHON_PN}-debtcollector \
-        ${PYTHON_PN}-pyparsing \
-        "
meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb +37 -1
index 3b4636a..8315443 100644
@@ -1,2 +1,38 @@
+DESCRIPTION = "Oslo utils"
+HOMEPAGE = "https://launchpad.net/oslo"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRCNAME = "oslo.utils"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike"
+
+PV = "3.28.0+git${SRCPV}"
+SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c"
+S = "${WORKDIR}/git"
+
+# DEPENDS_default: python3-pip
 inherit setuptools3
-require python-oslo.utils.inc
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        ${PYTHON_PN}-pbr \
+        "
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        ${PYTHON_PN}-pbr-native \
+        "
+
+# RDEPENDS_default:
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-pbr \
+        ${PYTHON_PN}-six \
+        ${PYTHON_PN}-iso8601 \
+        ${PYTHON_PN}-oslo.i18n \
+        ${PYTHON_PN}-pytz \
+        ${PYTHON_PN}-netaddr \
+        ${PYTHON_PN}-netifaces \
+        ${PYTHON_PN}-debtcollector \
+        ${PYTHON_PN}-pyparsing \
+        "
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/4 python3-oslo.serialization: Change python to python3

---
 ...it.bb => python3-oslo.serialization_git.bb} | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.serialization_git.bb => python3-oslo.serialization_git.bb} (71%)
meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb renamed from meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb +9 -9
similarity index 71%
rename from meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
rename to meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
index 80b86bb..36e9424 100644
@@ -13,23 +13,23 @@ S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-# DEPENDS_default: python-pip
+# DEPENDS_default: python3-pip
 
 DEPENDS += " \
-        python-pip \
-        python-pbr \
+        python3-pip \
+        python3-pbr \
         "
 
 # Satisfy setup.py 'setup_requires'
 DEPENDS += " \
-        python-pbr-native \
+        python3-pbr-native \
         "
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
-        python-pbr \
-        python-six \
-        python-oslo.utils \
-        python-pytz \
-        python-msgpack \
+        python3-pbr \
+        python3-six \
+        python3-oslo.utils \
+        python3-pytz \
+        python3-msgpack \
         "
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/4 python3-automaton: Change python to python3

In reply to Wang Mingyu
---
 ...automaton_0.8.0.bb => python3-automaton_0.8.0.bb} | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-automaton_0.8.0.bb => python3-automaton_0.8.0.bb} (76%)
meta-openstack/recipes-devtools/python/python3-automaton_0.8.0.bb renamed from meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb +6 -6
similarity index 76%
rename from meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb
rename to meta-openstack/recipes-devtools/python/python3-automaton_0.8.0.bb
index 41ec297..86be7ca 100644
@@ -10,18 +10,18 @@ SRC_URI[sha256sum] = "ca8bfbea03b9f39a536b4b261d90fbe8b1b0e1766bff5d8222e35691f8
 inherit setuptools3 pypi
 
 DEPENDS += " \
-        python-pip \
+        python3-pip \
         "
 
 # Satisfy setup.py 'setup_requires'
 DEPENDS += " \
-        python-pbr-native \
+        python3-pbr-native \
         "
 
 RDEPENDS_${PN} += " \
-        python-pbr \
-        python-six \
-        python-debtcollector \
-        python-prettytable \
+        python3-pbr \
+        python3-six \
+        python3-debtcollector \
+        python3-prettytable \
         "
 
Signature · 1 line
2.17.1
#3 lore raw

Re: [meta-virtualization][meta-cloud-services][PATCH] python3-flake8: Change python to python3

thanks for the updates. Most appreciated.

These are now merged.

Bruce

In message: [meta-virtualization][meta-cloud-services][PATCH] python3-flake8: Change python to python3

Quoted 65 lines · on 29/06/2020 Wang Mingyu wrote:

upgrade 2.4.0 -> 3.8.3

-License-Update: Copyright year updated to 2016.

---
 .../python/python-flake8_2.4.0.bb               | 17 -----------------
 .../python/python3-flake8_3.8.3.bb              | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-flake8_3.8.3.bb
meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb deleted +0 -17
deleted file mode 100644
index f476c42..0000000
@@ -1,17 +0,0 @@
-DESCRIPTION = "The modular source code checker: pep8, pyflakes and co"
-HOMEPAGE = "https://github.com/dreamhost/cliff"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7a76e57e683629e1ac2a49406169c2a3"
-
-SRC_URI[md5sum] = "d413935bb21026c18aca82654114502f"
-SRC_URI[sha256sum] = "d26a9d0252da9f831b8277b824961bb10b1f9d79f4752d32e4814b7bcd1e089b"
-
-inherit setuptools3 pypi
-
-RDEPENDS_${PN} += "python-prettytable \
-            python-cmd2 \
-            python-pyparsing \
-            python-mccabe \
-            python-pep8 \
-            python-pyflakes"
meta-openstack/recipes-devtools/python/python3-flake8_3.8.3.bb new file +17 -0
new file mode 100644
index 0000000..9385c80
@@ -0,0 +1,17 @@
+DESCRIPTION = "The modular source code checker: pep8, pyflakes and co"
+HOMEPAGE = "https://github.com/dreamhost/cliff"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=75b26781f1adf1aa310bda6098937878"
+
+SRC_URI[md5sum] = "b11380b47468c3dc7323396d4b8c1746"
+SRC_URI[sha256sum] = "f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208"
+
+inherit setuptools3 pypi
+
+RDEPENDS_${PN} += "python3-prettytable \
+            python3-cmd2 \
+            python3-pyparsing \
+            python3-mccabe \
+            python3-pep8 \
+            python3-pyflakes"
Signature · 1 line
2.17.1
#4 lore raw

PATCH 4/4 python3-taskflow: Change python to python3

In reply to Wang Mingyu

python-futures is only for Python 2, so remove it. python-enum34 or python3-enum34 are not exist, so remove python-enum34 from bb file.

---
 ...askflow_git.bb => python3-taskflow_git.bb} | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-taskflow_git.bb => python3-taskflow_git.bb} (53%)
meta-openstack/recipes-devtools/python/python3-taskflow_git.bb renamed from meta-openstack/recipes-devtools/python/python-taskflow_git.bb +17 -19
similarity index 53%
rename from meta-openstack/recipes-devtools/python/python-taskflow_git.bb
rename to meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
index a2fe43b..a9c4c30 100644
@@ -15,31 +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} += " \
-        python-pbr \
-        python-six \
-        python-enum34 \
-        python-futurist \
-        python-fasteners \
-        python-networkx \
-        python-contextlib2 \
-        python-stevedore \
-        python-futures \
-        python-jsonschema \
-        python-automaton \
-        python-oslo.utils \
-        python-oslo.serialization \
-        python-tenacity \
-        python-cachetools \
-        python-debtcollector \
+        python3-pbr \
+        python3-six \
+        python3-futurist \
+        python3-fasteners \
+        python3-networkx \
+        python3-contextlib2 \
+        python3-stevedore \
+        python3-jsonschema \
+        python3-automaton \
+        python3-oslo.utils \
+        python3-oslo.serialization \
+        python3-tenacity \
+        python3-cachetools \
+        python3-debtcollector \
         "
 	
Signature · 1 line
2.17.1