On Wed, Sep 11, 2019 at 6:34 PM Anuj Mittal <[email protected]> wrote: > > 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. > Signed-off-by: Anuj Mittal <[email protected]> > --- > .../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 > > diff --git a/meta-python/recipes-devtools/python/python-networkx.inc > b/meta-python/recipes-devtools/python/python-networkx.inc > new file mode 100644 > index 000000000..a4c31b2b2 > --- /dev/null > +++ b/meta-python/recipes-devtools/python/python-networkx.inc > @@ -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 \ > + " > diff --git a/meta-python/recipes-devtools/python/python-networkx_2.2.bb > b/meta-python/recipes-devtools/python/python-networkx_2.2.bb > index a2381661c..648f0312f 100644 > --- a/meta-python/recipes-devtools/python/python-networkx_2.2.bb > +++ b/meta-python/recipes-devtools/python/python-networkx_2.2.bb > @@ -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 > diff --git a/meta-python/recipes-devtools/python/python3-networkx_2.3.bb > b/meta-python/recipes-devtools/python/python3-networkx_2.3.bb > index da844ce1e..8feb6daa3 100644 > --- a/meta-python/recipes-devtools/python/python3-networkx_2.3.bb > +++ b/meta-python/recipes-devtools/python/python3-networkx_2.3.bb > @@ -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 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
