Skip to contentSkip to conversation

python-networkx: upgrade 2.1 -> 2.2

PATCH In review Anuj Mittal 2 participants 5 messages Sep 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 python-networkx: upgrade 2.1 -> 2.2

---
 .../python/{python-networkx_2.1.bb => python-networkx_2.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-python/recipes-devtools/python/{python-networkx_2.1.bb => python-networkx_2.2.bb} (65%)
meta-python/recipes-devtools/python/python-networkx_2.2.bb renamed from meta-python/recipes-devtools/python/python-networkx_2.1.bb +2 -2
similarity index 65%
rename from meta-python/recipes-devtools/python/python-networkx_2.1.bb
rename to meta-python/recipes-devtools/python/python-networkx_2.2.bb
index bc0c6863d..a2381661c 100644
@@ -2,8 +2,8 @@ DESCRIPTION = "Python package for creating and manipulating graphs and networks"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde"
 
-SRC_URI[md5sum] = "4a2c2a62dfc46ba7d594daca7c834995"
-SRC_URI[sha256sum] = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1"
+SRC_URI[md5sum] = "82608a3686fb3e61f20cf13bfd3c1b4a"
+SRC_URI[sha256sum] = "45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b"
 
 PYPI_PACKAGE_EXT = "zip"
 
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 python3-networkx: add recipe

networkx only supports python3 starting v2.3. Move the common code to .inc and remove python-2to3 RDEPENDS which is no longer needed:

https://github.com/networkx/networkx/commit/4e611d7ea90c20864daba912d6118220d5bbddf3

---
 .../recipes-devtools/python/python-networkx.inc      | 10 ++++++++++
 .../recipes-devtools/python/python-networkx_2.2.bb   | 10 +++-------
 .../recipes-devtools/python/python3-networkx_2.3.bb  | 12 +++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python-networkx.inc
meta-python/recipes-devtools/python/python-networkx.inc new file +10 -0
new file mode 100644
index 000000000..a4c31b2b2
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python package for creating and manipulating graphs and networks"
+LICENSE = "BSD-3-Clause"
+
+inherit pypi
+
+PYPI_PACKAGE_EXT = "zip"
+
+RDEPENDS_${PN} += "\
+                   ${PYTHON_PN}-decorator \
+                   "
meta-python/recipes-devtools/python/python-networkx_2.2.bb +3 -7
index a2381661c..648f0312f 100644
@@ -1,12 +1,8 @@
-DESCRIPTION = "Python package for creating and manipulating graphs and networks"
-LICENSE = "BSD-3-Clause"
+require python-networkx.inc
+
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde"
 
 SRC_URI[md5sum] = "82608a3686fb3e61f20cf13bfd3c1b4a"
 SRC_URI[sha256sum] = "45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b"
 
-PYPI_PACKAGE_EXT = "zip"
-
-inherit pypi setuptools
-
-RDEPENDS_${PN} += "python-2to3"
+inherit setuptools
meta-python/recipes-devtools/python/python3-networkx_2.3.bb +3 -9
index da844ce1e..8feb6daa3 100644
@@ -1,14 +1,8 @@
-DESCRIPTION = "Python package for creating and manipulating graphs and networks"
-LICENSE = "BSD-3-Clause"
+require python-networkx.inc
+
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd"
 
 SRC_URI[md5sum] = "320d3f6c7872732baa63cedafddadea9"
 SRC_URI[sha256sum] = "8311ddef63cf5c5c5e7c1d0212dd141d9a1fe3f474915281b73597ed5f1d4e3d"
 
-inherit pypi setuptools3
-
-PYPI_PACKAGE_EXT = "zip"
-
-RDEPENDS_${PN} += "\
-                   python3-decorator \
-                   "
+inherit setuptools3
Signature · 1 line
2.21.0
#2 lore raw

Re: [meta-python][PATCH 2/2] python3-networkx: add recipe

Quoted 6 lines · Anuj Mittal

networkx only supports python3 starting v2.3. Move the common code to .inc and remove python-2to3 RDEPENDS which is no longer needed:

https://github.com/networkx/networkx/commit/4e611d7ea90c20864daba912d6118220d5bbddf3

this patch does not apply cleanly. I think it would be good to move both recipes to 2.3 if possible.

Quoted 74 lines
---
 .../recipes-devtools/python/python-networkx.inc      | 10 ++++++++++
 .../recipes-devtools/python/python-networkx_2.2.bb   | 10 +++-------
 .../recipes-devtools/python/python3-networkx_2.3.bb  | 12 +++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python-networkx.inc
meta-python/recipes-devtools/python/python-networkx.inc new file +10 -0
new file mode 100644
index 000000000..a4c31b2b2
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python package for creating and manipulating graphs and networks"
+LICENSE = "BSD-3-Clause"
+
+inherit pypi
+
+PYPI_PACKAGE_EXT = "zip"
+
+RDEPENDS_${PN} += "\
+                   ${PYTHON_PN}-decorator \
+                   "
meta-python/recipes-devtools/python/python-networkx_2.2.bb +3 -7
index a2381661c..648f0312f 100644
@@ -1,12 +1,8 @@
-DESCRIPTION = "Python package for creating and manipulating graphs and networks"
-LICENSE = "BSD-3-Clause"
+require python-networkx.inc
+
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde"
 
 SRC_URI[md5sum] = "82608a3686fb3e61f20cf13bfd3c1b4a"
 SRC_URI[sha256sum] = "45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b"
 
-PYPI_PACKAGE_EXT = "zip"
-
-inherit pypi setuptools
-
-RDEPENDS_${PN} += "python-2to3"
+inherit setuptools
meta-python/recipes-devtools/python/python3-networkx_2.3.bb +3 -10
index da844ce1e..8feb6daa3 100644
@@ -1,14 +1,8 @@
-DESCRIPTION = "Python package for creating and manipulating graphs and networks"
-LICENSE = "BSD-3-Clause"
+require python-networkx.inc
+
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd"
 
 SRC_URI[md5sum] = "320d3f6c7872732baa63cedafddadea9"
 SRC_URI[sha256sum] = "8311ddef63cf5c5c5e7c1d0212dd141d9a1fe3f474915281b73597ed5f1d4e3d"
 
-inherit pypi setuptools3
-
-PYPI_PACKAGE_EXT = "zip"
-
-RDEPENDS_${PN} += "\
-                   python3-decorator \
-                   "
+inherit setuptools3
--

2.21.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#3 lore raw

Re: [meta-python][PATCH 2/2] python3-networkx: add recipe

Quoted 11 lines · Khem Raj
Quoted 6 lines · Anuj Mittal

networkx only supports python3 starting v2.3. Move the common code to
.inc and remove python-2to3 RDEPENDS which is no longer needed:

https://github.com/networkx/networkx/commit/4e611d7ea90c20864daba912d6118220d5bbddf3

this patch does not apply cleanly. I think it would be good to move both recipes to 2.3 if possible.

2.2 is the last release to support python2 so that will have to stay at 2.2.

https://networkx.github.io/documentation/stable/news.html#networkx-2-3

I will fix and send v2.

Thanks,

Anuj

#4 lore raw

PATCH v2 1/1 python3-networkx: add recipe

In reply to Khem Raj

networkx only supports python3 starting v2.3. Move the common code to .inc and remove python-2to3 RDEPENDS which is no longer needed:

https://github.com/networkx/networkx/commit/4e611d7ea90c20864daba912d6118220d5bbddf3

---
 .../recipes-devtools/python/python-networkx.inc        | 10 ++++++++++
 .../recipes-devtools/python/python-networkx_2.2.bb     | 10 +++-------
 .../recipes-devtools/python/python3-networkx_2.3.bb    |  8 ++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python-networkx.inc
 create mode 100644 meta-python/recipes-devtools/python/python3-networkx_2.3.bb
meta-python/recipes-devtools/python/python-networkx.inc new file +10 -0
new file mode 100644
index 000000000..a4c31b2b2
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python package for creating and manipulating graphs and networks"
+LICENSE = "BSD-3-Clause"
+
+inherit pypi
+
+PYPI_PACKAGE_EXT = "zip"
+
+RDEPENDS_${PN} += "\
+                   ${PYTHON_PN}-decorator \
+                   "
meta-python/recipes-devtools/python/python-networkx_2.2.bb +3 -7
index a2381661c..648f0312f 100644
@@ -1,12 +1,8 @@
-DESCRIPTION = "Python package for creating and manipulating graphs and networks"
-LICENSE = "BSD-3-Clause"
+require python-networkx.inc
+
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde"
 
 SRC_URI[md5sum] = "82608a3686fb3e61f20cf13bfd3c1b4a"
 SRC_URI[sha256sum] = "45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b"
 
-PYPI_PACKAGE_EXT = "zip"
-
-inherit pypi setuptools
-
-RDEPENDS_${PN} += "python-2to3"
+inherit setuptools
meta-python/recipes-devtools/python/python3-networkx_2.3.bb new file +8 -0
new file mode 100644
index 000000000..8feb6daa3
@@ -0,0 +1,8 @@
+require python-networkx.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd"
+
+SRC_URI[md5sum] = "320d3f6c7872732baa63cedafddadea9"
+SRC_URI[sha256sum] = "8311ddef63cf5c5c5e7c1d0212dd141d9a1fe3f474915281b73597ed5f1d4e3d"
+
+inherit setuptools3
Signature · 1 line
2.21.0