[meta-python][PATCH 1/3] python3-cycler: add recipe for 0.10.0

[meta-python][PATCH 1/3] python3-cycler: add recipe for 0.10.0

[Nicola Lunghi]

This is a dependency for python3-matplotlib

Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
---
 .../python/python3-cycler_0.10.0.bb              | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
new file mode 100644
index 000000000..cd21be8ac
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Composable style cycles"
+HOMEPAGE = "http://github.com/matplotlib/cycler"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811"
+
+SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b"
+SRC_URI[sha256sum] = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += "\
+    python3-core \
+    python3-six \
+"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.20.1

[meta-python][PATCH 2/3] python3-kiwisolver: add recipe for version 1.1.0

[Nicola Lunghi]

This is a dependency for python3-matplotlib

Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
---
 .../python/python3-kiwisolver_1.1.0.bb           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb
new file mode 100644
index 000000000..a10830257
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb
@@ -0,0 +1,16 @@
+SUMMARY = "A fast implementation of the Cassowary constraint solver"
+HOMEPAGE = "https://github.com/nucleic/kiwi"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=1c177d169db050341d3b890c69fb80e3"
+
+SRC_URI[md5sum] = "fc8a614367f7ba0d34a02fd08c535afc"
+SRC_URI[sha256sum] = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += "\
+    python3-core \
+    python3-setuptools \
+"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.20.1

[meta-python][PATCH 3/3] python3-matplotlib: fix dependencies and license

[Nicola Lunghi]

* The license indicated in the old recipe (and in this) is the PSF not the BSD
that was indicated before.
* fixed the dependencies (looking at the recipe at meta-jupiter
https://github.com/Xilinx/meta-jupyter/tree/master/recipes-python/
* the setupext script was a leftover from the python2 recipe remove it for now
  but probably has to be put updated and put back in the future:
  -> all the module are installed by default and they have different licenses?

Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
---
 .../python-matplotlib/fix_setupext.patch      | 110 ------------------
 .../python/python3-matplotlib_3.1.1.bb        |  24 ++--
 2 files changed, 17 insertions(+), 117 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch

diff --git a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
deleted file mode 100644
index 21b9094a1..000000000
--- a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-This fixes the numpy import problem in setupext.py using a hard-coded path.
-
-Index: matplotlib-2.0.2/setupext.py
-===================================================================
---- matplotlib-2.0.2.orig/setupext.py
-+++ matplotlib-2.0.2/setupext.py
-@@ -148,6 +148,7 @@ def has_include_file(include_dirs, filen
-     Returns `True` if `filename` can be found in one of the
-     directories in `include_dirs`.
-     """
-+    return True
-     if sys.platform == 'win32':
-         include_dirs += os.environ.get('INCLUDE', '.').split(';')
-     for dir in include_dirs:
-@@ -172,7 +173,7 @@ def get_base_dirs():
-     Returns a list of standard base directories on this platform.
-     """
-     if options['basedirlist']:
--        return options['basedirlist']
-+        return [os.environ['STAGING_LIBDIR']]
- 
-     basedir_map = {
-         'win32': ['win32_static', ],
-@@ -260,14 +261,6 @@ def make_extension(name, files, *args, *
-     `distutils.core.Extension` constructor.
-     """
-     ext = DelayedExtension(name, files, *args, **kwargs)
--    for dir in get_base_dirs():
--        include_dir = os.path.join(dir, 'include')
--        if os.path.exists(include_dir):
--            ext.include_dirs.append(include_dir)
--        for lib in ('lib', 'lib64'):
--            lib_dir = os.path.join(dir, lib)
--            if os.path.exists(lib_dir):
--                ext.library_dirs.append(lib_dir)
-     ext.include_dirs.append('.')
- 
-     return ext
-@@ -314,6 +307,7 @@ class PkgConfig(object):
-                     "    matplotlib may not be able to find some of its dependencies")
- 
-     def set_pkgconfig_path(self):
-+        return
-         pkgconfig_path = sysconfig.get_config_var('LIBDIR')
-         if pkgconfig_path is None:
-             return
-@@ -875,14 +869,14 @@ class Numpy(SetupPackage):
-             reload(numpy)
- 
-         ext = Extension('test', [])
--        ext.include_dirs.append(numpy.get_include())
-+        ext.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/'))
-         if not has_include_file(
-                 ext.include_dirs, os.path.join("numpy", "arrayobject.h")):
-             warnings.warn(
-                 "The C headers for numpy could not be found. "
-                 "You may need to install the development package")
- 
--        return [numpy.get_include()]
-+        return [os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')]
- 
-     def check(self):
-         min_version = extract_versions()['__version__numpy__']
-Index: matplotlib-2.0.2/setup.py
-===================================================================
---- matplotlib-2.0.2.orig/setup.py
-+++ matplotlib-2.0.2/setup.py
-@@ -66,28 +66,6 @@ mpl_packages = [
-     setupext.Python(),
-     setupext.Platform(),
-     'Required dependencies and extensions',
--    setupext.Numpy(),
--    setupext.Six(),
--    setupext.Dateutil(),
--    setupext.FuncTools32(),
--    setupext.Subprocess32(),
--    setupext.Pytz(),
--    setupext.Cycler(),
--    setupext.Tornado(),
--    setupext.Pyparsing(),
--    setupext.LibAgg(),
--    setupext.FreeType(),
--    setupext.FT2Font(),
--    setupext.Png(),
--    setupext.Qhull(),
--    setupext.Image(),
--    setupext.TTConv(),
--    setupext.Path(),
--    setupext.ContourLegacy(),
--    setupext.Contour(),
--    setupext.Delaunay(),
--    setupext.QhullWrap(),
--    setupext.Tri(),
-     'Optional subpackages',
-     setupext.SampleData(),
-     setupext.Toolkits(),
-@@ -100,13 +78,8 @@ mpl_packages = [
-     setupext.BackendMacOSX(),
-     setupext.BackendQt5(),
-     setupext.BackendQt4(),
--    setupext.BackendGtk3Agg(),
-     setupext.BackendGtk3Cairo(),
--    setupext.BackendGtkAgg(),
--    setupext.BackendTkAgg(),
--    setupext.BackendWxAgg(),
-     setupext.BackendGtk(),
--    setupext.BackendAgg(),
-     setupext.BackendCairo(),
-     setupext.Windowing(),
-     'Optional LaTeX dependencies',
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
index 824680c24..1fb234c8e 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
@@ -4,16 +4,26 @@ Matplotlib is a Python 2D plotting library which produces \
 publication-quality figures in a variety of hardcopy formats \
 and interactive environments across platforms."
 HOMEPAGE = "https://github.com/matplotlib/matplotlib"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74"
-
-DEPENDS = "python3-numpy-native python3-numpy freetype libpng python3-dateutil python3-pytz"
-RDEPENDS_${PN} = "python3-numpy freetype libpng python3-dateutil python3-pytz"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "\
+    file://setup.py;beginline=275;endline=275;md5=2a114620e4e6843aa7568d5902501753 \
+    file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \
+"
+DEPENDS = "python3-numpy-native freetype libpng"
 
 SRC_URI[md5sum] = "f894af5564a588e880644123237251b7"
 SRC_URI[sha256sum] = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93"
 
-PYPI_PACKAGE = "matplotlib"
-inherit pypi setuptools3
+inherit pypi setuptools3 pkgconfig
+
+EXTRA_OECONF = "--disable-docs"
+
+RDEPENDS_${PN} += "\
+    python3-numpy \
+    python3-pyparsing \
+    python3-cycler \
+    python3-dateutil \
+    python3-kiwisolver \
+"
 
 BBCLASSEXTEND = "native"
-- 
2.20.1

Re: [meta-python][PATCH 3/3] python3-matplotlib: fix dependencies and license

[Khem Raj]

please rebase on master-next and resend.

On Wed, Mar 11, 2020 at 12:05 AM Nicola Lunghi <nick83ola@gmail.com> wrote:
>
> * The license indicated in the old recipe (and in this) is the PSF not the BSD
> that was indicated before.
> * fixed the dependencies (looking at the recipe at meta-jupiter
> https://github.com/Xilinx/meta-jupyter/tree/master/recipes-python/
> * the setupext script was a leftover from the python2 recipe remove it for now
>   but probably has to be put updated and put back in the future:
>   -> all the module are installed by default and they have different licenses?
>
> Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
> ---
>  .../python-matplotlib/fix_setupext.patch      | 110 ------------------
>  .../python/python3-matplotlib_3.1.1.bb        |  24 ++--
>  2 files changed, 17 insertions(+), 117 deletions(-)
>  delete mode 100644 meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
>
> diff --git a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
> deleted file mode 100644
> index 21b9094a1..000000000
> --- a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
> +++ /dev/null
> @@ -1,110 +0,0 @@
> -This fixes the numpy import problem in setupext.py using a hard-coded path.
> -
> -Index: matplotlib-2.0.2/setupext.py
> -===================================================================
> ---- matplotlib-2.0.2.orig/setupext.py
> -+++ matplotlib-2.0.2/setupext.py
> -@@ -148,6 +148,7 @@ def has_include_file(include_dirs, filen
> -     Returns `True` if `filename` can be found in one of the
> -     directories in `include_dirs`.
> -     """
> -+    return True
> -     if sys.platform == 'win32':
> -         include_dirs += os.environ.get('INCLUDE', '.').split(';')
> -     for dir in include_dirs:
> -@@ -172,7 +173,7 @@ def get_base_dirs():
> -     Returns a list of standard base directories on this platform.
> -     """
> -     if options['basedirlist']:
> --        return options['basedirlist']
> -+        return [os.environ['STAGING_LIBDIR']]
> -
> -     basedir_map = {
> -         'win32': ['win32_static', ],
> -@@ -260,14 +261,6 @@ def make_extension(name, files, *args, *
> -     `distutils.core.Extension` constructor.
> -     """
> -     ext = DelayedExtension(name, files, *args, **kwargs)
> --    for dir in get_base_dirs():
> --        include_dir = os.path.join(dir, 'include')
> --        if os.path.exists(include_dir):
> --            ext.include_dirs.append(include_dir)
> --        for lib in ('lib', 'lib64'):
> --            lib_dir = os.path.join(dir, lib)
> --            if os.path.exists(lib_dir):
> --                ext.library_dirs.append(lib_dir)
> -     ext.include_dirs.append('.')
> -
> -     return ext
> -@@ -314,6 +307,7 @@ class PkgConfig(object):
> -                     "    matplotlib may not be able to find some of its dependencies")
> -
> -     def set_pkgconfig_path(self):
> -+        return
> -         pkgconfig_path = sysconfig.get_config_var('LIBDIR')
> -         if pkgconfig_path is None:
> -             return
> -@@ -875,14 +869,14 @@ class Numpy(SetupPackage):
> -             reload(numpy)
> -
> -         ext = Extension('test', [])
> --        ext.include_dirs.append(numpy.get_include())
> -+        ext.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/'))
> -         if not has_include_file(
> -                 ext.include_dirs, os.path.join("numpy", "arrayobject.h")):
> -             warnings.warn(
> -                 "The C headers for numpy could not be found. "
> -                 "You may need to install the development package")
> -
> --        return [numpy.get_include()]
> -+        return [os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')]
> -
> -     def check(self):
> -         min_version = extract_versions()['__version__numpy__']
> -Index: matplotlib-2.0.2/setup.py
> -===================================================================
> ---- matplotlib-2.0.2.orig/setup.py
> -+++ matplotlib-2.0.2/setup.py
> -@@ -66,28 +66,6 @@ mpl_packages = [
> -     setupext.Python(),
> -     setupext.Platform(),
> -     'Required dependencies and extensions',
> --    setupext.Numpy(),
> --    setupext.Six(),
> --    setupext.Dateutil(),
> --    setupext.FuncTools32(),
> --    setupext.Subprocess32(),
> --    setupext.Pytz(),
> --    setupext.Cycler(),
> --    setupext.Tornado(),
> --    setupext.Pyparsing(),
> --    setupext.LibAgg(),
> --    setupext.FreeType(),
> --    setupext.FT2Font(),
> --    setupext.Png(),
> --    setupext.Qhull(),
> --    setupext.Image(),
> --    setupext.TTConv(),
> --    setupext.Path(),
> --    setupext.ContourLegacy(),
> --    setupext.Contour(),
> --    setupext.Delaunay(),
> --    setupext.QhullWrap(),
> --    setupext.Tri(),
> -     'Optional subpackages',
> -     setupext.SampleData(),
> -     setupext.Toolkits(),
> -@@ -100,13 +78,8 @@ mpl_packages = [
> -     setupext.BackendMacOSX(),
> -     setupext.BackendQt5(),
> -     setupext.BackendQt4(),
> --    setupext.BackendGtk3Agg(),
> -     setupext.BackendGtk3Cairo(),
> --    setupext.BackendGtkAgg(),
> --    setupext.BackendTkAgg(),
> --    setupext.BackendWxAgg(),
> -     setupext.BackendGtk(),
> --    setupext.BackendAgg(),
> -     setupext.BackendCairo(),
> -     setupext.Windowing(),
> -     'Optional LaTeX dependencies',
> diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
> index 824680c24..1fb234c8e 100644
> --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb
> @@ -4,16 +4,26 @@ Matplotlib is a Python 2D plotting library which produces \
>  publication-quality figures in a variety of hardcopy formats \
>  and interactive environments across platforms."
>  HOMEPAGE = "https://github.com/matplotlib/matplotlib"
> -LICENSE = "BSD-2-Clause"
> -LIC_FILES_CHKSUM = "file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74"
> -
> -DEPENDS = "python3-numpy-native python3-numpy freetype libpng python3-dateutil python3-pytz"
> -RDEPENDS_${PN} = "python3-numpy freetype libpng python3-dateutil python3-pytz"
> +LICENSE = "PSF"
> +LIC_FILES_CHKSUM = "\
> +    file://setup.py;beginline=275;endline=275;md5=2a114620e4e6843aa7568d5902501753 \
> +    file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \
> +"
> +DEPENDS = "python3-numpy-native freetype libpng"
>
>  SRC_URI[md5sum] = "f894af5564a588e880644123237251b7"
>  SRC_URI[sha256sum] = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93"
>
> -PYPI_PACKAGE = "matplotlib"
> -inherit pypi setuptools3
> +inherit pypi setuptools3 pkgconfig
> +
> +EXTRA_OECONF = "--disable-docs"
> +
> +RDEPENDS_${PN} += "\
> +    python3-numpy \
> +    python3-pyparsing \
> +    python3-cycler \
> +    python3-dateutil \
> +    python3-kiwisolver \
> +"
>
>  BBCLASSEXTEND = "native"
> --
> 2.20.1
>

Re: [meta-python][PATCH 1/3] python3-cycler: add recipe for 0.10.0

[Tim Orling]

FWIW, I had made significant progress towards getting ptest enabled for
Matplotlib, although a bit out of date now [1]. Which included a recipe for
cycler. It also unbundled a bunch of dependencies, like libagg.

The ptests do require a fair amount of ram, so standard qemu settings will
epically fail.

[1]
https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python-matplotlib-2.1.2-WIP

On Wed, Mar 11, 2020 at 12:04 AM Nicola Lunghi <nick83ola@gmail.com> wrote:

> This is a dependency for python3-matplotlib
>
> Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
> ---
>  .../python/python3-cycler_0.10.0.bb              | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>  create mode 100644 meta-python/recipes-devtools/python/
> python3-cycler_0.10.0.bb
>
> diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
> b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
> new file mode 100644
> index 000000000..cd21be8ac
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
> @@ -0,0 +1,16 @@
> +SUMMARY = "Composable style cycles"
> +HOMEPAGE = "http://github.com/matplotlib/cycler"
> +LICENSE = "BSD"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811"
> +
> +SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b"
> +SRC_URI[sha256sum] =
> "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
> +
> +inherit pypi setuptools3
> +
> +RDEPENDS_${PN} += "\
> +    python3-core \
> +    python3-six \
> +"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-python][PATCH 1/3] python3-cycler: add recipe for 0.10.0

[nick83ola]

Hi TIm,
nice work I'll have a look into it

Thanks for sharing
Nick


On Wed, 11 Mar 2020 at 14:47, Tim Orling <ticotimo@gmail.com> wrote:
>
> FWIW, I had made significant progress towards getting ptest enabled for Matplotlib, although a bit out of date now [1]. Which included a recipe for cycler. It also unbundled a bunch of dependencies, like libagg.
>
> The ptests do require a fair amount of ram, so standard qemu settings will epically fail.
>
> [1]
> https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/python-matplotlib-2.1.2-WIP
>
> On Wed, Mar 11, 2020 at 12:04 AM Nicola Lunghi <nick83ola@gmail.com> wrote:
>>
>> This is a dependency for python3-matplotlib
>>
>> Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
>> ---
>>  .../python/python3-cycler_0.10.0.bb              | 16 ++++++++++++++++
>>  1 file changed, 16 insertions(+)
>>  create mode 100644 meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
>>
>> diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
>> new file mode 100644
>> index 000000000..cd21be8ac
>> --- /dev/null
>> +++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb
>> @@ -0,0 +1,16 @@
>> +SUMMARY = "Composable style cycles"
>> +HOMEPAGE = "http://github.com/matplotlib/cycler"
>> +LICENSE = "BSD"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811"
>> +
>> +SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b"
>> +SRC_URI[sha256sum] = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
>> +
>> +inherit pypi setuptools3
>> +
>> +RDEPENDS_${PN} += "\
>> +    python3-core \
>> +    python3-six \
>> +"
>> +
>> +BBCLASSEXTEND = "native nativesdk"
>> --
>> 2.20.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel