* [ptxdist] [PATCH] python3-numpy: New package
@ 2019-11-11 15:13 Guillermo Rodríguez
2019-11-12 9:32 ` [ptxdist] [PATCH v2] " Guillermo Rodríguez
2019-11-12 9:51 ` [ptxdist] [PATCH] " Roland Hieber
0 siblings, 2 replies; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-11 15:13 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
rules/python3-numpy.in | 11 +++++++++
rules/python3-numpy.make | 52 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..2edbab146
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,11 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ select HOST_PYTHON3_CYTHON
+ select HOST_PYTHON3_SETUPTOOLS
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..4c1ee70c3
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,52 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.16.1
+PYTHON3_NUMPY_MD5 := bddcc682669b4be438db5eab61aa39b5
+PYTHON3_NUMPY := Numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := tar.gz
+PYTHON3_NUMPY_URL := https://github.com/numpy/numpy/archive/v$(PYTHON3_NUMPY_VERSION).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [ptxdist] [PATCH v2] python3-numpy: New package
2019-11-11 15:13 [ptxdist] [PATCH] python3-numpy: New package Guillermo Rodríguez
@ 2019-11-12 9:32 ` Guillermo Rodríguez
2019-11-12 9:51 ` [ptxdist] [PATCH] " Roland Hieber
1 sibling, 0 replies; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-12 9:32 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
v2: Switch to PyPi URL; this removes the dependency on Cython.
rules/python3-numpy.in | 10 ++++++++
rules/python3-numpy.make | 52 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..1440e409a
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,10 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ select HOST_PYTHON3_SETUPTOOLS
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..b9a33e043
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,52 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.16.1
+PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
+PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := zip
+PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH] python3-numpy: New package
2019-11-11 15:13 [ptxdist] [PATCH] python3-numpy: New package Guillermo Rodríguez
2019-11-12 9:32 ` [ptxdist] [PATCH v2] " Guillermo Rodríguez
@ 2019-11-12 9:51 ` Roland Hieber
2019-11-12 11:48 ` Guillermo Rodriguez Garcia
2019-11-12 11:51 ` [ptxdist] [PATCH v3] " Guillermo Rodríguez
1 sibling, 2 replies; 26+ messages in thread
From: Roland Hieber @ 2019-11-12 9:51 UTC (permalink / raw)
To: Guillermo Rodríguez; +Cc: ptxdist
On Mon, Nov 11, 2019 at 04:13:18PM +0100, Guillermo Rodríguez wrote:
> NumPy is the fundamental package for scientific computing with Python.
>
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
> rules/python3-numpy.in | 11 +++++++++
> rules/python3-numpy.make | 52 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 63 insertions(+)
> create mode 100644 rules/python3-numpy.in
> create mode 100644 rules/python3-numpy.make
>
> diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> new file mode 100644
> index 000000000..2edbab146
> --- /dev/null
> +++ b/rules/python3-numpy.in
> @@ -0,0 +1,11 @@
> +## SECTION=python3
> +
> +config PYTHON3_NUMPY
> + tristate
> + select PYTHON3
> + select HOST_PYTHON3_CYTHON
> + select HOST_PYTHON3_SETUPTOOLS
> + prompt "python3-numpy"
> + help
> + NumPy is the fundamental package for scientific computing with
> + Python.
> diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> new file mode 100644
> index 000000000..4c1ee70c3
> --- /dev/null
> +++ b/rules/python3-numpy.make
> @@ -0,0 +1,52 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> +
> +#
> +# Paths and names
> +#
> +PYTHON3_NUMPY_VERSION := 1.16.1
> +PYTHON3_NUMPY_MD5 := bddcc682669b4be438db5eab61aa39b5
> +PYTHON3_NUMPY := Numpy-$(PYTHON3_NUMPY_VERSION)
> +PYTHON3_NUMPY_SUFFIX := tar.gz
> +PYTHON3_NUMPY_URL := https://github.com/numpy/numpy/archive/v$(PYTHON3_NUMPY_VERSION).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> +PYTHON3_NUMPY_LICENSE := BSD
While you're at it, please add at least one file and MD5 sum to the
PYTHON3_NUMPY_LICENSE_FILES variable. And according to LICENSE.txt,
there are also files under different licenses in the source tree, these
licenses should be added here as well.
- Roland
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_NUMPY_CONF_TOOL := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-numpy.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, python3-numpy)
> + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> + @$(call install_fixup, python3-numpy, SECTION, base)
> + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
> + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> +
> + @$(call install_glob, python3-numpy, 0, 0, -, \
> + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> +
> + @$(call install_finish, python3-numpy)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.21.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH] python3-numpy: New package
2019-11-12 9:51 ` [ptxdist] [PATCH] " Roland Hieber
@ 2019-11-12 11:48 ` Guillermo Rodriguez Garcia
2019-11-12 11:51 ` [ptxdist] [PATCH v3] " Guillermo Rodríguez
1 sibling, 0 replies; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-12 11:48 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 1009 bytes --]
Hi Roland,
El mar., 12 nov. 2019 a las 10:51, Roland Hieber (<rhi@pengutronix.de>)
escribió:
[...]
> > +PYTHON3_NUMPY_VERSION := 1.16.1
> > +PYTHON3_NUMPY_MD5 := bddcc682669b4be438db5eab61aa39b5
> > +PYTHON3_NUMPY := Numpy-$(PYTHON3_NUMPY_VERSION)
> > +PYTHON3_NUMPY_SUFFIX := tar.gz
> > +PYTHON3_NUMPY_URL :=
> https://github.com/numpy/numpy/archive/v$(PYTHON3_NUMPY_VERSION).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_SOURCE :=
> $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> > +PYTHON3_NUMPY_LICENSE := BSD
>
> While you're at it, please add at least one file and MD5 sum to the
> PYTHON3_NUMPY_LICENSE_FILES variable. And according to LICENSE.txt,
> there are also files under different licenses in the source tree, these
> licenses should be added here as well.
>
Not sure how this works, let me give it a try.
BR,
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
[-- Attachment #1.2: Type: text/html, Size: 1699 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-12 9:51 ` [ptxdist] [PATCH] " Roland Hieber
2019-11-12 11:48 ` Guillermo Rodriguez Garcia
@ 2019-11-12 11:51 ` Guillermo Rodríguez
2019-11-13 9:36 ` Roland Hieber
1 sibling, 1 reply; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-12 11:51 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
v2: Switch to PyPi URL; this removes the dependency on Cython.
v3: Update LICENSE, add LICENSE_FILES
rules/python3-numpy.in | 10 ++++++++
rules/python3-numpy.make | 54 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..1440e409a
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,10 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ select HOST_PYTHON3_SETUPTOOLS
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..40cc351d3
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,54 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.16.1
+PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
+PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := zip
+PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
+PYTHON3_NUMPY_LICENSE_FILES := \
+ file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-12 11:51 ` [ptxdist] [PATCH v3] " Guillermo Rodríguez
@ 2019-11-13 9:36 ` Roland Hieber
2019-11-14 9:36 ` Guillermo Rodriguez Garcia
0 siblings, 1 reply; 26+ messages in thread
From: Roland Hieber @ 2019-11-13 9:36 UTC (permalink / raw)
To: Guillermo Rodríguez; +Cc: ptxdist
On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote:
> NumPy is the fundamental package for scientific computing with Python.
>
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
> v2: Switch to PyPi URL; this removes the dependency on Cython.
> v3: Update LICENSE, add LICENSE_FILES
>
> rules/python3-numpy.in | 10 ++++++++
> rules/python3-numpy.make | 54 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 64 insertions(+)
> create mode 100644 rules/python3-numpy.in
> create mode 100644 rules/python3-numpy.make
>
> diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> new file mode 100644
> index 000000000..1440e409a
> --- /dev/null
> +++ b/rules/python3-numpy.in
> @@ -0,0 +1,10 @@
> +## SECTION=python3
> +
> +config PYTHON3_NUMPY
> + tristate
> + select PYTHON3
> + select HOST_PYTHON3_SETUPTOOLS
> + prompt "python3-numpy"
> + help
> + NumPy is the fundamental package for scientific computing with
> + Python.
> diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> new file mode 100644
> index 000000000..40cc351d3
> --- /dev/null
> +++ b/rules/python3-numpy.make
> @@ -0,0 +1,54 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> +
> +#
> +# Paths and names
> +#
> +PYTHON3_NUMPY_VERSION := 1.16.1
> +PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
> +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> +PYTHON3_NUMPY_SUFFIX := zip
> +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
AND Apache-2.0, according to LICENSE.txt. I would also add all the other
license files mentioned therein so we notice when they change or vanish.
The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is
currently not available as an SPDX identifier, so I would leave this as
"AND UNKNOWN", and wait until the respective SPDX issue is resolved...
https://github.com/spdx/license-list-XML/issues/919
numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere
else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and add
its verbatim license text with startline and endline parameters in
PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
texts mentioned in that variable and adds them to the license report,
so it doesn't get lost too :)
> +PYTHON3_NUMPY_LICENSE_FILES := \
> + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231
file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \
file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616 \
file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e \
(numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the
tarball, see https://github.com/numpy/numpy/issues/13295)
For reference, that last one can be generated with a
sed -n 2,22p < inputfilename | md5sum
Please check if all of this (especially the MD5s) make sense to you :)
- Roland
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_NUMPY_CONF_TOOL := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-numpy.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, python3-numpy)
> + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> + @$(call install_fixup, python3-numpy, SECTION, base)
> + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
> + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> +
> + @$(call install_glob, python3-numpy, 0, 0, -, \
> + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> +
> + @$(call install_finish, python3-numpy)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.21.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-13 9:36 ` Roland Hieber
@ 2019-11-14 9:36 ` Guillermo Rodriguez Garcia
2019-11-14 9:56 ` Roland Hieber
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-14 9:36 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 4469 bytes --]
Hi Roland,
El mié., 13 nov. 2019 a las 10:36, Roland Hieber (<rhi@pengutronix.de>)
escribió:
> On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote:
> > NumPy is the fundamental package for scientific computing with Python.
> >
> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > ---
> > v2: Switch to PyPi URL; this removes the dependency on Cython.
> > v3: Update LICENSE, add LICENSE_FILES
> >
> > rules/python3-numpy.in | 10 ++++++++
> > rules/python3-numpy.make | 54 ++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 64 insertions(+)
> > create mode 100644 rules/python3-numpy.in
> > create mode 100644 rules/python3-numpy.make
> >
> > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> > new file mode 100644
> > index 000000000..1440e409a
> > --- /dev/null
> > +++ b/rules/python3-numpy.in
> > @@ -0,0 +1,10 @@
> > +## SECTION=python3
> > +
> > +config PYTHON3_NUMPY
> > + tristate
> > + select PYTHON3
> > + select HOST_PYTHON3_SETUPTOOLS
> > + prompt "python3-numpy"
> > + help
> > + NumPy is the fundamental package for scientific computing with
> > + Python.
> > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> > new file mode 100644
> > index 000000000..40cc351d3
> > --- /dev/null
> > +++ b/rules/python3-numpy.make
> > @@ -0,0 +1,54 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com
> >
> > +#
> > +# For further information about the PTXdist project and license
> conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> > +
> > +#
> > +# Paths and names
> > +#
> > +PYTHON3_NUMPY_VERSION := 1.16.1
> > +PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
> > +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> > +PYTHON3_NUMPY_SUFFIX := zip
> > +PYTHON3_NUMPY_URL :=
> https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_SOURCE :=
> $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> > +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
>
> AND Apache-2.0, according to LICENSE.txt.
I assume you mean LICENSES_bundled.txt and not LICENSE.txt
If I am reading that correctly, the Apache license only applies to the
Sphinx theme. Since we are not bundling any documentation, I assume we can
ignore this one.
> I would also add all the other
> license files mentioned therein so we notice when they change or vanish.
>
> The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is
> currently not available as an SPDX identifier, so I would leave this as
> "AND UNKNOWN", and wait until the respective SPDX issue is resolved...
> https://github.com/spdx/license-list-XML/issues/919
Same as above, this only applies to the Sphinx theme, so I assume we can
ignore this.
>
>
> numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere
> else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and add
> its verbatim license text with startline and endline parameters in
> PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> texts mentioned in that variable and adds them to the license report,
> so it doesn't get lost too :)
>
OK.
>
> > +PYTHON3_NUMPY_LICENSE_FILES := \
> > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231
>
>
> file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \
>
> file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616
> \
>
> file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
>
> file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e
> \
>
> (numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the
> tarball, see https://github.com/numpy/numpy/issues/13295)
>
> For reference, that last one can be generated with a
>
> sed -n 2,22p < inputfilename | md5sum
>
> Please check if all of this (especially the MD5s) make sense to you :)
>
Yes. Will double check and submit a new version of the patch.
Thank you!
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
[-- Attachment #1.2: Type: text/html, Size: 6791 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 9:36 ` Guillermo Rodriguez Garcia
@ 2019-11-14 9:56 ` Roland Hieber
2019-11-14 10:01 ` Guillermo Rodriguez Garcia
2019-11-14 10:07 ` [ptxdist] [PATCH v3] " Guillermo Rodriguez Garcia
0 siblings, 2 replies; 26+ messages in thread
From: Roland Hieber @ 2019-11-14 9:56 UTC (permalink / raw)
To: Guillermo Rodriguez Garcia; +Cc: ptxdist
On Thu, Nov 14, 2019 at 10:36:56AM +0100, Guillermo Rodriguez Garcia wrote:
> Hi Roland,
>
> El mié., 13 nov. 2019 a las 10:36, Roland Hieber (<rhi@pengutronix.de>)
> escribió:
>
> > On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote:
> > > NumPy is the fundamental package for scientific computing with Python.
> > >
> > > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > > ---
> > > v2: Switch to PyPi URL; this removes the dependency on Cython.
> > > v3: Update LICENSE, add LICENSE_FILES
> > >
> > > rules/python3-numpy.in | 10 ++++++++
> > > rules/python3-numpy.make | 54 ++++++++++++++++++++++++++++++++++++++++
> > > 2 files changed, 64 insertions(+)
> > > create mode 100644 rules/python3-numpy.in
> > > create mode 100644 rules/python3-numpy.make
> > >
> > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> > > new file mode 100644
> > > index 000000000..1440e409a
> > > --- /dev/null
> > > +++ b/rules/python3-numpy.in
> > > @@ -0,0 +1,10 @@
> > > +## SECTION=python3
> > > +
> > > +config PYTHON3_NUMPY
> > > + tristate
> > > + select PYTHON3
> > > + select HOST_PYTHON3_SETUPTOOLS
> > > + prompt "python3-numpy"
> > > + help
> > > + NumPy is the fundamental package for scientific computing with
> > > + Python.
> > > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> > > new file mode 100644
> > > index 000000000..40cc351d3
> > > --- /dev/null
> > > +++ b/rules/python3-numpy.make
> > > @@ -0,0 +1,54 @@
> > > +# -*-makefile-*-
> > > +#
> > > +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com
> > >
> > > +#
> > > +# For further information about the PTXdist project and license
> > conditions
> > > +# see the README file.
> > > +#
> > > +
> > > +#
> > > +# We provide this package
> > > +#
> > > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> > > +
> > > +#
> > > +# Paths and names
> > > +#
> > > +PYTHON3_NUMPY_VERSION := 1.16.1
> > > +PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
> > > +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> > > +PYTHON3_NUMPY_SUFFIX := zip
> > > +PYTHON3_NUMPY_URL :=
> > https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > > +PYTHON3_NUMPY_SOURCE :=
> > $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> > > +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
> >
> > AND Apache-2.0, according to LICENSE.txt.
>
>
> I assume you mean LICENSES_bundled.txt and not LICENSE.txt
I don't have a LICENSES_bundled.txt in the extracted zip file with that
MD5sum from that URL...
> If I am reading that correctly, the Apache license only applies to the
> Sphinx theme. Since we are not bundling any documentation, I assume we can
> ignore this one.
OK. That was not clear to me.
- Roland
>
>
> > I would also add all the other
> > license files mentioned therein so we notice when they change or vanish.
> >
> > The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is
> > currently not available as an SPDX identifier, so I would leave this as
> > "AND UNKNOWN", and wait until the respective SPDX issue is resolved...
> > https://github.com/spdx/license-list-XML/issues/919
>
>
> Same as above, this only applies to the Sphinx theme, so I assume we can
> ignore this.
>
>
> >
> >
> > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere
> > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and add
> > its verbatim license text with startline and endline parameters in
> > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > texts mentioned in that variable and adds them to the license report,
> > so it doesn't get lost too :)
> >
>
> OK.
>
>
> >
> > > +PYTHON3_NUMPY_LICENSE_FILES := \
> > > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231
> >
> >
> > file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \
> >
> > file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616
> > \
> >
> > file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
> >
> > file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e
> > \
> >
> > (numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the
> > tarball, see https://github.com/numpy/numpy/issues/13295)
> >
> > For reference, that last one can be generated with a
> >
> > sed -n 2,22p < inputfilename | md5sum
> >
> > Please check if all of this (especially the MD5s) make sense to you :)
> >
>
> Yes. Will double check and submit a new version of the patch.
>
> Thank you!
>
> Guillermo Rodriguez Garcia
> guille.rodriguez@gmail.com
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 9:56 ` Roland Hieber
@ 2019-11-14 10:01 ` Guillermo Rodriguez Garcia
2019-11-14 10:03 ` [ptxdist] [PATCH v4] " Guillermo Rodríguez
2019-11-14 10:07 ` [ptxdist] [PATCH v3] " Guillermo Rodriguez Garcia
1 sibling, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-14 10:01 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 6031 bytes --]
El jue., 14 nov. 2019 a las 10:56, Roland Hieber (<rhi@pengutronix.de>)
escribió:
> On Thu, Nov 14, 2019 at 10:36:56AM +0100, Guillermo Rodriguez Garcia wrote:
> > Hi Roland,
> >
> > El mié., 13 nov. 2019 a las 10:36, Roland Hieber (<rhi@pengutronix.de>)
> > escribió:
> >
> > > On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote:
> > > > NumPy is the fundamental package for scientific computing with
> Python.
> > > >
> > > > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > > > ---
> > > > v2: Switch to PyPi URL; this removes the dependency on Cython.
> > > > v3: Update LICENSE, add LICENSE_FILES
> > > >
> > > > rules/python3-numpy.in | 10 ++++++++
> > > > rules/python3-numpy.make | 54
> ++++++++++++++++++++++++++++++++++++++++
> > > > 2 files changed, 64 insertions(+)
> > > > create mode 100644 rules/python3-numpy.in
> > > > create mode 100644 rules/python3-numpy.make
> > > >
> > > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> > > > new file mode 100644
> > > > index 000000000..1440e409a
> > > > --- /dev/null
> > > > +++ b/rules/python3-numpy.in
> > > > @@ -0,0 +1,10 @@
> > > > +## SECTION=python3
> > > > +
> > > > +config PYTHON3_NUMPY
> > > > + tristate
> > > > + select PYTHON3
> > > > + select HOST_PYTHON3_SETUPTOOLS
> > > > + prompt "python3-numpy"
> > > > + help
> > > > + NumPy is the fundamental package for scientific computing
> with
> > > > + Python.
> > > > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> > > > new file mode 100644
> > > > index 000000000..40cc351d3
> > > > --- /dev/null
> > > > +++ b/rules/python3-numpy.make
> > > > @@ -0,0 +1,54 @@
> > > > +# -*-makefile-*-
> > > > +#
> > > > +# Copyright (C) 2019 by Guillermo Rodriguez <
> guille.rodriguez@gmail.com
> > > >
> > > > +#
> > > > +# For further information about the PTXdist project and license
> > > conditions
> > > > +# see the README file.
> > > > +#
> > > > +
> > > > +#
> > > > +# We provide this package
> > > > +#
> > > > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> > > > +
> > > > +#
> > > > +# Paths and names
> > > > +#
> > > > +PYTHON3_NUMPY_VERSION := 1.16.1
> > > > +PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
> > > > +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> > > > +PYTHON3_NUMPY_SUFFIX := zip
> > > > +PYTHON3_NUMPY_URL :=
> > >
> https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > > > +PYTHON3_NUMPY_SOURCE :=
> > > $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > > > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> > > > +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
> > >
> > > AND Apache-2.0, according to LICENSE.txt.
> >
> >
> > I assume you mean LICENSES_bundled.txt and not LICENSE.txt
>
> I don't have a LICENSES_bundled.txt in the extracted zip file with that
> MD5sum from that URL...
>
Right, sorry. The tarball combines the LICENSE.txt and LICENSES_bundled.txt
files from the Github repo into one single LICENSE.txt file. I mixed them
up.
Guillermo
>
> > If I am reading that correctly, the Apache license only applies to the
> > Sphinx theme. Since we are not bundling any documentation, I assume we
> can
> > ignore this one.
>
> OK. That was not clear to me.
>
> - Roland
>
> >
> >
> > > I would also add all the other
> > > license files mentioned therein so we notice when they change or
> vanish.
> > >
> > > The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is
> > > currently not available as an SPDX identifier, so I would leave this as
> > > "AND UNKNOWN", and wait until the respective SPDX issue is resolved...
> > > https://github.com/spdx/license-list-XML/issues/919
> >
> >
> > Same as above, this only applies to the Sphinx theme, so I assume we can
> > ignore this.
> >
> >
> > >
> > >
> > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere
> > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and
> add
> > > its verbatim license text with startline and endline parameters in
> > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > texts mentioned in that variable and adds them to the license report,
> > > so it doesn't get lost too :)
> > >
> >
> > OK.
> >
> >
> > >
> > > > +PYTHON3_NUMPY_LICENSE_FILES := \
> > > > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231
> > >
> > >
> > > file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \
> > >
> > >
> file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616
> > > \
> > >
> > >
> file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
> > >
> > >
> file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e
> > > \
> > >
> > > (numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the
> > > tarball, see https://github.com/numpy/numpy/issues/13295)
> > >
> > > For reference, that last one can be generated with a
> > >
> > > sed -n 2,22p < inputfilename | md5sum
> > >
> > > Please check if all of this (especially the MD5s) make sense to you :)
> > >
> >
> > Yes. Will double check and submit a new version of the patch.
> >
> > Thank you!
> >
> > Guillermo Rodriguez Garcia
> > guille.rodriguez@gmail.com
>
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
>
> --
> Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
> Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
--
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
[-- Attachment #1.2: Type: text/html, Size: 9156 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [ptxdist] [PATCH v4] python3-numpy: New package
2019-11-14 10:01 ` Guillermo Rodriguez Garcia
@ 2019-11-14 10:03 ` Guillermo Rodríguez
0 siblings, 0 replies; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-14 10:03 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
v2: Switch to PyPi URL; this removes the dependency on Cython.
v3: Update LICENSE, add LICENSE_FILES
v4: Update LICENSE and LICENSE_FILES with additional licenses
rules/python3-numpy.in | 10 +++++++
rules/python3-numpy.make | 57 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..1440e409a
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,10 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ select HOST_PYTHON3_SETUPTOOLS
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..4adc0dda8
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.16.1
+PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
+PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := zip
+PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT AND unknown
+PYTHON3_NUMPY_LICENSE_FILES := \
+ file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 \
+ file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
+ file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 9:56 ` Roland Hieber
2019-11-14 10:01 ` Guillermo Rodriguez Garcia
@ 2019-11-14 10:07 ` Guillermo Rodriguez Garcia
2019-11-14 10:09 ` [ptxdist] [PATCH v5] " Guillermo Rodríguez
2019-11-14 11:18 ` [ptxdist] [PATCH v3] " Roland Hieber
1 sibling, 2 replies; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-14 10:07 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 735 bytes --]
Hi Roland,
El jue., 14 nov. 2019 a las 10:56, Roland Hieber (<rhi@pengutronix.de>)
escribió:
> > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere
> > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and
> add
> > > its verbatim license text with startline and endline parameters in
> > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > texts mentioned in that variable and adds them to the license report,
> > > so it doesn't get lost too :)
>
On re-reading this: The license in dragon4.c is just MIT. So while it is OK
to add it to LICENSE_FILES I think we should not add the "AND unknown" bit.
I am sending v5, sorry for the noise.
Guillermo
[-- Attachment #1.2: Type: text/html, Size: 1163 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [ptxdist] [PATCH v5] python3-numpy: New package
2019-11-14 10:07 ` [ptxdist] [PATCH v3] " Guillermo Rodriguez Garcia
@ 2019-11-14 10:09 ` Guillermo Rodríguez
2019-11-14 20:24 ` Ladislav Michl
2019-11-14 11:18 ` [ptxdist] [PATCH v3] " Roland Hieber
1 sibling, 1 reply; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-14 10:09 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
v2: Switch to PyPi URL; this removes the dependency on Cython.
v3: Update LICENSE, add LICENSE_FILES
v4: Update LICENSE and LICENSE_FILES with additional licenses
v5: Removed "unknown" from LICENSE
rules/python3-numpy.in | 10 +++++++
rules/python3-numpy.make | 57 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..1440e409a
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,10 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ select HOST_PYTHON3_SETUPTOOLS
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..a8a0d4dfe
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.16.1
+PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
+PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := zip
+PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
+PYTHON3_NUMPY_LICENSE_FILES := \
+ file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 \
+ file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
+ file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 10:07 ` [ptxdist] [PATCH v3] " Guillermo Rodriguez Garcia
2019-11-14 10:09 ` [ptxdist] [PATCH v5] " Guillermo Rodríguez
@ 2019-11-14 11:18 ` Roland Hieber
2019-11-14 11:40 ` Guillermo Rodriguez Garcia
1 sibling, 1 reply; 26+ messages in thread
From: Roland Hieber @ 2019-11-14 11:18 UTC (permalink / raw)
To: Guillermo Rodriguez Garcia; +Cc: ptxdist
On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia wrote:
> El jue., 14 nov. 2019 a las 10:56, Roland Hieber (<rhi@pengutronix.de>)
> escribió:
>
> > > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere
> > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and
> > add
> > > > its verbatim license text with startline and endline parameters in
> > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > > texts mentioned in that variable and adds them to the license report,
> > > > so it doesn't get lost too :)
> >
>
> On re-reading this: The license in dragon4.c is just MIT. So while it is OK
> to add it to LICENSE_FILES I think we should not add the "AND unknown" bit.
Oh. I just blindly believed LICENSE.txt. But now that you say it, my
license matcher identifies it as "Zlib", not as "MIT".
> I am sending v5, sorry for the noise.
No problem, that's what review is for, and thanks for your patience :)
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 11:18 ` [ptxdist] [PATCH v3] " Roland Hieber
@ 2019-11-14 11:40 ` Guillermo Rodriguez Garcia
2019-11-14 13:31 ` Roland Hieber
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-14 11:40 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 2675 bytes --]
El jue., 14 nov. 2019 a las 12:18, Roland Hieber (<rhi@pengutronix.de>)
escribió:
> On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia wrote:
> > El jue., 14 nov. 2019 a las 10:56, Roland Hieber (<rhi@pengutronix.de>)
> > escribió:
> >
> > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found
> nowhere
> > > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE
> and
> > > add
> > > > > its verbatim license text with startline and endline parameters in
> > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > > > texts mentioned in that variable and adds them to the license
> report,
> > > > > so it doesn't get lost too :)
> > >
> >
> > On re-reading this: The license in dragon4.c is just MIT. So while it is
> OK
> > to add it to LICENSE_FILES I think we should not add the "AND unknown"
> bit.
>
> Oh. I just blindly believed LICENSE.txt. But now that you say it, my
> license matcher identifies it as "Zlib", not as "MIT".
>
Uhm, doesn't look like Zlib to me; here's the license text extracted from
dragon4.c:
/*
* Copyright (c) 2014 Ryan Juckett
*
* Permission is hereby granted, free of charge, to any person obtaining a
copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation
the
* rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or
* sell copies of the Software, and to permit persons to whom the Software
is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS
* IN THE SOFTWARE.
*/
And here are the MIT and Zlib licenses:
https://spdx.org/licenses/MIT.html
https://spdx.org/licenses/Zlib.html
I would say that the license is indeed MIT, which is what LICENSE.txt says:
Name: dragon4
Files: numpy/core/src/multiarray/dragon4.c
License: MIT
For license text, see numpy/core/src/multiarray/dragon4.c
BR,
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
[-- Attachment #1.2: Type: text/html, Size: 3981 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 11:40 ` Guillermo Rodriguez Garcia
@ 2019-11-14 13:31 ` Roland Hieber
2019-11-14 18:50 ` Guillermo Rodriguez Garcia
0 siblings, 1 reply; 26+ messages in thread
From: Roland Hieber @ 2019-11-14 13:31 UTC (permalink / raw)
To: Guillermo Rodriguez Garcia; +Cc: ptxdist
On Thu, Nov 14, 2019 at 12:40:43PM +0100, Guillermo Rodriguez Garcia wrote:
> El jue., 14 nov. 2019 a las 12:18, Roland Hieber (<rhi@pengutronix.de>)
> escribió:
>
> > On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia wrote:
> > > El jue., 14 nov. 2019 a las 10:56, Roland Hieber (<rhi@pengutronix.de>)
> > > escribió:
> > >
> > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found
> > nowhere
> > > > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE
> > and
> > > > add
> > > > > > its verbatim license text with startline and endline parameters in
> > > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > > > > texts mentioned in that variable and adds them to the license
> > report,
> > > > > > so it doesn't get lost too :)
> > > >
> > >
> > > On re-reading this: The license in dragon4.c is just MIT. So while it is
> > OK
> > > to add it to LICENSE_FILES I think we should not add the "AND unknown"
> > bit.
> >
> > Oh. I just blindly believed LICENSE.txt. But now that you say it, my
> > license matcher identifies it as "Zlib", not as "MIT".
> >
>
> Uhm, doesn't look like Zlib to me; here's the license text extracted from
> dragon4.c:
>
> /*
> * Copyright (c) 2014 Ryan Juckett
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> * of this software and associated documentation files (the "Software"), to
> * deal in the Software without restriction, including without limitation
> the
> * rights to use, copy, modify, merge, publish, distribute, sublicense,
> and/or
> * sell copies of the Software, and to permit persons to whom the Software
> is
> * furnished to do so, subject to the following conditions:
> *
> * The above copyright notice and this permission notice shall be included
> in
> * all copies or substantial portions of the Software.
> *
> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR
> * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> * IN THE SOFTWARE.
> */
>
> And here are the MIT and Zlib licenses:
>
> https://spdx.org/licenses/MIT.html
> https://spdx.org/licenses/Zlib.html
>
> I would say that the license is indeed MIT, which is what LICENSE.txt says:
>
> Name: dragon4
> Files: numpy/core/src/multiarray/dragon4.c
> License: MIT
> For license text, see numpy/core/src/multiarray/dragon4.c
We're looking at different versions of the code. Your make file
specifies 1.16.1, and indeed that license was changed in commit
2babaaa12 ("LICENSE: update dragon4 license to MIT.") [1], which landed
in numpy 1.17.4. The _LICENSE vars should describe the version in the
make file.
Do you want to send a version-bump to the new version
instead? ;-)
[1]: https://github.com/numpy/numpy/commit/2babaaa123c64c9f8d47d5b8b05942ab2c79a4e3
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v3] python3-numpy: New package
2019-11-14 13:31 ` Roland Hieber
@ 2019-11-14 18:50 ` Guillermo Rodriguez Garcia
2019-11-15 8:51 ` [ptxdist] [PATCH v6] " Guillermo Rodríguez
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-14 18:50 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 4466 bytes --]
El jue., 14 nov. 2019 a las 14:31, Roland Hieber (<rhi@pengutronix.de>)
escribió:
> On Thu, Nov 14, 2019 at 12:40:43PM +0100, Guillermo Rodriguez Garcia wrote:
> > El jue., 14 nov. 2019 a las 12:18, Roland Hieber (<rhi@pengutronix.de>)
> > escribió:
> >
> > > On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia
> wrote:
> > > > El jue., 14 nov. 2019 a las 10:56, Roland Hieber (<
> rhi@pengutronix.de>)
> > > > escribió:
> > > >
> > > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found
> > > nowhere
> > > > > > > else, so I would also add "AND UNKNOWN" to
> PYTHON3_NUMPY_LICENSE
> > > and
> > > > > add
> > > > > > > its verbatim license text with startline and endline
> parameters in
> > > > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > > > > > texts mentioned in that variable and adds them to the license
> > > report,
> > > > > > > so it doesn't get lost too :)
> > > > >
> > > >
> > > > On re-reading this: The license in dragon4.c is just MIT. So while
> it is
> > > OK
> > > > to add it to LICENSE_FILES I think we should not add the "AND
> unknown"
> > > bit.
> > >
> > > Oh. I just blindly believed LICENSE.txt. But now that you say it, my
> > > license matcher identifies it as "Zlib", not as "MIT".
> > >
> >
> > Uhm, doesn't look like Zlib to me; here's the license text extracted from
> > dragon4.c:
> >
> > /*
> > * Copyright (c) 2014 Ryan Juckett
> > *
> > * Permission is hereby granted, free of charge, to any person obtaining
> a
> > copy
> > * of this software and associated documentation files (the "Software"),
> to
> > * deal in the Software without restriction, including without limitation
> > the
> > * rights to use, copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > * sell copies of the Software, and to permit persons to whom the
> Software
> > is
> > * furnished to do so, subject to the following conditions:
> > *
> > * The above copyright notice and this permission notice shall be
> included
> > in
> > * all copies or substantial portions of the Software.
> > *
> > * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS
> > OR
> > * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> > * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> SHALL
> > THE
> > * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> ARISING
> > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> > DEALINGS
> > * IN THE SOFTWARE.
> > */
> >
> > And here are the MIT and Zlib licenses:
> >
> > https://spdx.org/licenses/MIT.html
> > https://spdx.org/licenses/Zlib.html
> >
> > I would say that the license is indeed MIT, which is what LICENSE.txt
> says:
> >
> > Name: dragon4
> > Files: numpy/core/src/multiarray/dragon4.c
> > License: MIT
> > For license text, see numpy/core/src/multiarray/dragon4.c
>
> We're looking at different versions of the code. Your make file
> specifies 1.16.1, and indeed that license was changed in commit
> 2babaaa12 ("LICENSE: update dragon4 license to MIT.") [1], which landed
> in numpy 1.17.4. The _LICENSE vars should describe the version in the
> make file.
>
Ops. You are right. I didn't realize the license had changed so I mixed
things up.
>
> Do you want to send a version-bump to the new version
> instead? ;-)
>
The reason why I did not do that is that 1.17.x releases break
cross-compilation.
I reported this (https://github.com/numpy/numpy/issues/14861) a few days
ago and it has been fixed since then.
So I guess yes, the best is to upgrade to 1.17.4 (will need to include a
patch for the issue linked above, since the fix has not made it to any
public release yet)
Thank you,
Guillermo
>
> [1]:
> https://github.com/numpy/numpy/commit/2babaaa123c64c9f8d47d5b8b05942ab2c79a4e3
>
> - Roland
>
>
> --
> Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
> Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
--
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
[-- Attachment #1.2: Type: text/html, Size: 6563 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v5] python3-numpy: New package
2019-11-14 10:09 ` [ptxdist] [PATCH v5] " Guillermo Rodríguez
@ 2019-11-14 20:24 ` Ladislav Michl
0 siblings, 0 replies; 26+ messages in thread
From: Ladislav Michl @ 2019-11-14 20:24 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
Hi,
just in case v6 will follow see small nit bellow...
On Thu, Nov 14, 2019 at 11:09:14AM +0100, Guillermo Rodríguez wrote:
> NumPy is the fundamental package for scientific computing with Python.
>
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
> v2: Switch to PyPi URL; this removes the dependency on Cython.
> v3: Update LICENSE, add LICENSE_FILES
> v4: Update LICENSE and LICENSE_FILES with additional licenses
> v5: Removed "unknown" from LICENSE
>
> rules/python3-numpy.in | 10 +++++++
> rules/python3-numpy.make | 57 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 67 insertions(+)
> create mode 100644 rules/python3-numpy.in
> create mode 100644 rules/python3-numpy.make
>
> diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> new file mode 100644
> index 000000000..1440e409a
> --- /dev/null
> +++ b/rules/python3-numpy.in
> @@ -0,0 +1,10 @@
> +## SECTION=python3
> +
> +config PYTHON3_NUMPY
> + tristate
> + select PYTHON3
> + select HOST_PYTHON3_SETUPTOOLS
> + prompt "python3-numpy"
> + help
> + NumPy is the fundamental package for scientific computing with
> + Python.
> diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> new file mode 100644
> index 000000000..a8a0d4dfe
> --- /dev/null
> +++ b/rules/python3-numpy.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> +
> +#
> +# Paths and names
> +#
> +PYTHON3_NUMPY_VERSION := 1.16.1
> +PYTHON3_NUMPY_MD5 := dafda51934f645d888866f98424521ae
> +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> +PYTHON3_NUMPY_SUFFIX := zip
> +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
> +PYTHON3_NUMPY_LICENSE_FILES := \
> + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 \
> + file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
> + file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e
^^^ - those two lines above: TABs please.
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_NUMPY_CONF_TOOL := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-numpy.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, python3-numpy)
> + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> + @$(call install_fixup, python3-numpy, SECTION, base)
> + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
> + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> +
> + @$(call install_glob, python3-numpy, 0, 0, -, \
> + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> +
> + @$(call install_finish, python3-numpy)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.21.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [ptxdist] [PATCH v6] python3-numpy: New package
2019-11-14 18:50 ` Guillermo Rodriguez Garcia
@ 2019-11-15 8:51 ` Guillermo Rodríguez
2019-11-15 14:19 ` Michael Olbrich
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-15 8:51 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
v2: Switch to PyPi URL; this removes the dependency on Cython.
v3: Update LICENSE, add LICENSE_FILES
v4: Update LICENSE and LICENSE_FILES with additional licenses
v5: Removed "unknown" from LICENSE
v6: Updated to 1.17.4, added patch to fix cross compilation
.../numpy-1.17.4/0001-remove-sse2-flag.patch | 21 +++++++
patches/numpy-1.17.4/series | 1 +
rules/python3-numpy.in | 10 ++++
rules/python3-numpy.make | 57 +++++++++++++++++++
4 files changed, 89 insertions(+)
create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
create mode 100644 patches/numpy-1.17.4/series
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
new file mode 100644
index 000000000..e1cb0d878
--- /dev/null
+++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
@@ -0,0 +1,21 @@
+Fix cross-compilation for non-Intel targets.
+See: https://github.com/numpy/numpy/issues/14861
+
+---
+
+Index: numpy-1.17.4/numpy/random/setup.py
+===================================================================
+--- numpy-1.17.4.orig/numpy/random/setup.py 2019-11-08 08:41:56.000000000 +0100
++++ numpy-1.17.4/numpy/random/setup.py 2019-11-15 07:57:15.996694807 +0100
+@@ -49,11 +49,6 @@
+ elif not is_msvc:
+ # Some bit generators require c99
+ EXTRA_COMPILE_ARGS += ['-std=c99']
+- INTEL_LIKE = any(arch in platform.machine()
+- for arch in ('x86', 'i686', 'i386', 'amd64'))
+- if INTEL_LIKE:
+- # Assumes GCC or GCC-like compiler
+- EXTRA_COMPILE_ARGS += ['-msse2']
+
+ # Use legacy integer variable sizes
+ LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
new file mode 100644
index 000000000..64785c945
--- /dev/null
+++ b/patches/numpy-1.17.4/series
@@ -0,0 +1 @@
+0001-remove-sse2-flag.patch
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..1440e409a
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,10 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ select HOST_PYTHON3_SETUPTOOLS
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..6b161856b
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.17.4
+PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe
+PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := zip
+PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
+PYTHON3_NUMPY_LICENSE_FILES := \
+ file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \
+ file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
+ file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v6] python3-numpy: New package
2019-11-15 8:51 ` [ptxdist] [PATCH v6] " Guillermo Rodríguez
@ 2019-11-15 14:19 ` Michael Olbrich
2019-11-15 20:11 ` [ptxdist] [PATCH] " Guillermo Rodriguez Garcia
0 siblings, 1 reply; 26+ messages in thread
From: Michael Olbrich @ 2019-11-15 14:19 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
On Fri, Nov 15, 2019 at 09:51:25AM +0100, Guillermo Rodríguez wrote:
> NumPy is the fundamental package for scientific computing with Python.
>
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
> v2: Switch to PyPi URL; this removes the dependency on Cython.
> v3: Update LICENSE, add LICENSE_FILES
> v4: Update LICENSE and LICENSE_FILES with additional licenses
> v5: Removed "unknown" from LICENSE
> v6: Updated to 1.17.4, added patch to fix cross compilation
>
> .../numpy-1.17.4/0001-remove-sse2-flag.patch | 21 +++++++
> patches/numpy-1.17.4/series | 1 +
> rules/python3-numpy.in | 10 ++++
> rules/python3-numpy.make | 57 +++++++++++++++++++
> 4 files changed, 89 insertions(+)
> create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> create mode 100644 patches/numpy-1.17.4/series
> create mode 100644 rules/python3-numpy.in
> create mode 100644 rules/python3-numpy.make
>
> diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> new file mode 100644
> index 000000000..e1cb0d878
> --- /dev/null
> +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> @@ -0,0 +1,21 @@
> +Fix cross-compilation for non-Intel targets.
> +See: https://github.com/numpy/numpy/issues/14861
> +
> +---
Please create a proper patch header. PTXdist can help with this:
https://www.ptxdist.org/doc/dev_manual.html#using-git
> +
> +Index: numpy-1.17.4/numpy/random/setup.py
> +===================================================================
> +--- numpy-1.17.4.orig/numpy/random/setup.py 2019-11-08 08:41:56.000000000 +0100
> ++++ numpy-1.17.4/numpy/random/setup.py 2019-11-15 07:57:15.996694807 +0100
> +@@ -49,11 +49,6 @@
> + elif not is_msvc:
> + # Some bit generators require c99
> + EXTRA_COMPILE_ARGS += ['-std=c99']
> +- INTEL_LIKE = any(arch in platform.machine()
> +- for arch in ('x86', 'i686', 'i386', 'amd64'))
> +- if INTEL_LIKE:
> +- # Assumes GCC or GCC-like compiler
> +- EXTRA_COMPILE_ARGS += ['-msse2']
> +
> + # Use legacy integer variable sizes
> + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
> diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
> new file mode 100644
> index 000000000..64785c945
> --- /dev/null
> +++ b/patches/numpy-1.17.4/series
> @@ -0,0 +1 @@
> +0001-remove-sse2-flag.patch
> diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> new file mode 100644
> index 000000000..1440e409a
> --- /dev/null
> +++ b/rules/python3-numpy.in
> @@ -0,0 +1,10 @@
> +## SECTION=python3
> +
> +config PYTHON3_NUMPY
> + tristate
> + select PYTHON3
> + select HOST_PYTHON3_SETUPTOOLS
Just PYTHON3 is sufficient. HOST_PYTHON3_SETUPTOOLS is selected there.
Michael
> + prompt "python3-numpy"
> + help
> + NumPy is the fundamental package for scientific computing with
> + Python.
> diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> new file mode 100644
> index 000000000..6b161856b
> --- /dev/null
> +++ b/rules/python3-numpy.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> +
> +#
> +# Paths and names
> +#
> +PYTHON3_NUMPY_VERSION := 1.17.4
> +PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe
> +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> +PYTHON3_NUMPY_SUFFIX := zip
> +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
> +PYTHON3_NUMPY_LICENSE_FILES := \
> + file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \
> + file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
> + file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_NUMPY_CONF_TOOL := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-numpy.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, python3-numpy)
> + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> + @$(call install_fixup, python3-numpy, SECTION, base)
> + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
> + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> +
> + @$(call install_glob, python3-numpy, 0, 0, -, \
> + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> +
> + @$(call install_finish, python3-numpy)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.21.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH] python3-numpy: New package
2019-11-15 14:19 ` Michael Olbrich
@ 2019-11-15 20:11 ` Guillermo Rodriguez Garcia
2019-11-19 9:10 ` Guillermo Rodriguez Garcia
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-15 20:11 UTC (permalink / raw)
To: ptxdist, Guillermo Rodríguez
[-- Attachment #1.1: Type: text/plain, Size: 6876 bytes --]
Hi Michael,
El viernes, 15 de noviembre de 2019, Michael Olbrich <
m.olbrich@pengutronix.de> escribió:
> On Fri, Nov 15, 2019 at 09:51:25AM +0100, Guillermo Rodríguez wrote:
> > NumPy is the fundamental package for scientific computing with Python.
> >
> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > ---
> > v2: Switch to PyPi URL; this removes the dependency on Cython.
> > v3: Update LICENSE, add LICENSE_FILES
> > v4: Update LICENSE and LICENSE_FILES with additional licenses
> > v5: Removed "unknown" from LICENSE
> > v6: Updated to 1.17.4, added patch to fix cross compilation
> >
> > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 21 +++++++
> > patches/numpy-1.17.4/series | 1 +
> > rules/python3-numpy.in | 10 ++++
> > rules/python3-numpy.make | 57 +++++++++++++++++++
> > 4 files changed, 89 insertions(+)
> > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > create mode 100644 patches/numpy-1.17.4/series
> > create mode 100644 rules/python3-numpy.in
> > create mode 100644 rules/python3-numpy.make
> >
> > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > new file mode 100644
> > index 000000000..e1cb0d878
> > --- /dev/null
> > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > @@ -0,0 +1,21 @@
> > +Fix cross-compilation for non-Intel targets.
> > +See: https://github.com/numpy/numpy/issues/14861
> > +
> > +---
>
> Please create a proper patch header.
>
Can you please let me know what is wrong specifically? The patch was
generated by quilt and I just added the comment in the first two lines.
I'd prefer to fix whatever is wrong in the patch header rather than
regenerate the patch using a different method.
BR,
Guillermo
>
> PTXdist can help with this:
>
> https://www.ptxdist.org/doc/dev_manual.html#using-git
>
> > +
> > +Index: numpy-1.17.4/numpy/random/setup.py
> > +===================================================================
> > +--- numpy-1.17.4.orig/numpy/random/setup.py 2019-11-08
> 08:41:56.000000000 +0100
> > ++++ numpy-1.17.4/numpy/random/setup.py 2019-11-15
> 07:57:15.996694807 +0100
> > +@@ -49,11 +49,6 @@
> > + elif not is_msvc:
> > + # Some bit generators require c99
> > + EXTRA_COMPILE_ARGS += ['-std=c99']
> > +- INTEL_LIKE = any(arch in platform.machine()
> > +- for arch in ('x86', 'i686', 'i386', 'amd64'))
> > +- if INTEL_LIKE:
> > +- # Assumes GCC or GCC-like compiler
> > +- EXTRA_COMPILE_ARGS += ['-msse2']
> > +
> > + # Use legacy integer variable sizes
> > + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
> > diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
> > new file mode 100644
> > index 000000000..64785c945
> > --- /dev/null
> > +++ b/patches/numpy-1.17.4/series
> > @@ -0,0 +1 @@
> > +0001-remove-sse2-flag.patch
> > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> > new file mode 100644
> > index 000000000..1440e409a
> > --- /dev/null
> > +++ b/rules/python3-numpy.in
> > @@ -0,0 +1,10 @@
> > +## SECTION=python3
> > +
> > +config PYTHON3_NUMPY
> > + tristate
> > + select PYTHON3
> > + select HOST_PYTHON3_SETUPTOOLS
>
> Just PYTHON3 is sufficient. HOST_PYTHON3_SETUPTOOLS is selected there.
>
> Michael
>
> > + prompt "python3-numpy"
> > + help
> > + NumPy is the fundamental package for scientific computing with
> > + Python.
> > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> > new file mode 100644
> > index 000000000..6b161856b
> > --- /dev/null
> > +++ b/rules/python3-numpy.make
> > @@ -0,0 +1,57 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com
> >
> > +#
> > +# For further information about the PTXdist project and license
> conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> > +
> > +#
> > +# Paths and names
> > +#
> > +PYTHON3_NUMPY_VERSION := 1.17.4
> > +PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe
> > +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> > +PYTHON3_NUMPY_SUFFIX := zip
> > +PYTHON3_NUMPY_URL := https://pypi.python.org/
> packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(
> PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> > +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
> > +PYTHON3_NUMPY_LICENSE_FILES := \
> > + file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \
> > + file://tools/npy_tempita/license.txt;md5=
> c66b85ddcd09296abff87601467724fd \
> > + file://numpy/core/src/multiarray/dragon4.c;
> startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720
> > +
> > +
> > +# ------------------------------------------------------------
> ----------------
> > +# Prepare
> > +# ------------------------------------------------------------
> ----------------
> > +
> > +PYTHON3_NUMPY_CONF_TOOL := python3
> > +
> > +# ------------------------------------------------------------
> ----------------
> > +# Target-Install
> > +# ------------------------------------------------------------
> ----------------
> > +
> > +$(STATEDIR)/python3-numpy.targetinstall:
> > + @$(call targetinfo)
> > +
> > + @$(call install_init, python3-numpy)
> > + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> > + @$(call install_fixup, python3-numpy, SECTION, base)
> > + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez
> <guille.rodriguez@gmail.com>")
> > + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> > +
> > + @$(call install_glob, python3-numpy, 0, 0, -, \
> > + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,,
> *.py)
> > +
> > + @$(call install_finish, python3-numpy)
> > +
> > + @$(call touch)
> > +
> > +# vim: syntax=make
> > --
> > 2.21.0
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
--
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
[-- Attachment #1.2: Type: text/html, Size: 9715 bytes --]
[-- Attachment #2: Type: text/plain, Size: 92 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH] python3-numpy: New package
2019-11-15 20:11 ` [ptxdist] [PATCH] " Guillermo Rodriguez Garcia
@ 2019-11-19 9:10 ` Guillermo Rodriguez Garcia
2019-11-19 9:23 ` Michael Olbrich
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-19 9:10 UTC (permalink / raw)
To: ptxdist
Hi Michael,
El vie., 15 nov. 2019 a las 21:11, Guillermo Rodriguez Garcia
(<guille.rodriguez@gmail.com>) escribió:
>
> Hi Michael,
>
> El viernes, 15 de noviembre de 2019, Michael Olbrich <m.olbrich@pengutronix.de> escribió:
>>
>> On Fri, Nov 15, 2019 at 09:51:25AM +0100, Guillermo Rodríguez wrote:
>> > NumPy is the fundamental package for scientific computing with Python.
>> >
>> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
>> > ---
>> > v2: Switch to PyPi URL; this removes the dependency on Cython.
>> > v3: Update LICENSE, add LICENSE_FILES
>> > v4: Update LICENSE and LICENSE_FILES with additional licenses
>> > v5: Removed "unknown" from LICENSE
>> > v6: Updated to 1.17.4, added patch to fix cross compilation
>> >
>> > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 21 +++++++
>> > patches/numpy-1.17.4/series | 1 +
>> > rules/python3-numpy.in | 10 ++++
>> > rules/python3-numpy.make | 57 +++++++++++++++++++
>> > 4 files changed, 89 insertions(+)
>> > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
>> > create mode 100644 patches/numpy-1.17.4/series
>> > create mode 100644 rules/python3-numpy.in
>> > create mode 100644 rules/python3-numpy.make
>> >
>> > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
>> > new file mode 100644
>> > index 000000000..e1cb0d878
>> > --- /dev/null
>> > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
>> > @@ -0,0 +1,21 @@
>> > +Fix cross-compilation for non-Intel targets.
>> > +See: https://github.com/numpy/numpy/issues/14861
>> > +
>> > +---
>>
>> Please create a proper patch header.
>>
>>
>
> Can you please let me know what is wrong specifically? The patch was generated by quilt and I just added the comment in the first two lines.
>
> I'd prefer to fix whatever is wrong in the patch header rather than regenerate the patch using a different method.
Waiting for feedback on this one in order to generate a new version
that would fix the patch header and remove the explicit
HOST_PYTHON3_SETUPTOOLS dependency.
BR,
Guillermo
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH] python3-numpy: New package
2019-11-19 9:10 ` Guillermo Rodriguez Garcia
@ 2019-11-19 9:23 ` Michael Olbrich
2019-11-19 10:15 ` Guillermo Rodriguez Garcia
0 siblings, 1 reply; 26+ messages in thread
From: Michael Olbrich @ 2019-11-19 9:23 UTC (permalink / raw)
To: ptxdist
Hi,
On Tue, Nov 19, 2019 at 10:10:09AM +0100, Guillermo Rodriguez Garcia wrote:
> El vie., 15 nov. 2019 a las 21:11, Guillermo Rodriguez Garcia
> (<guille.rodriguez@gmail.com>) escribió:
> > El viernes, 15 de noviembre de 2019, Michael Olbrich <m.olbrich@pengutronix.de> escribió:
> >> On Fri, Nov 15, 2019 at 09:51:25AM +0100, Guillermo Rodríguez wrote:
> >> > NumPy is the fundamental package for scientific computing with Python.
> >> >
> >> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> >> > ---
> >> > v2: Switch to PyPi URL; this removes the dependency on Cython.
> >> > v3: Update LICENSE, add LICENSE_FILES
> >> > v4: Update LICENSE and LICENSE_FILES with additional licenses
> >> > v5: Removed "unknown" from LICENSE
> >> > v6: Updated to 1.17.4, added patch to fix cross compilation
> >> >
> >> > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 21 +++++++
> >> > patches/numpy-1.17.4/series | 1 +
> >> > rules/python3-numpy.in | 10 ++++
> >> > rules/python3-numpy.make | 57 +++++++++++++++++++
> >> > 4 files changed, 89 insertions(+)
> >> > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> >> > create mode 100644 patches/numpy-1.17.4/series
> >> > create mode 100644 rules/python3-numpy.in
> >> > create mode 100644 rules/python3-numpy.make
> >> >
> >> > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> >> > new file mode 100644
> >> > index 000000000..e1cb0d878
> >> > --- /dev/null
> >> > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> >> > @@ -0,0 +1,21 @@
> >> > +Fix cross-compilation for non-Intel targets.
> >> > +See: https://github.com/numpy/numpy/issues/14861
> >> > +
> >> > +---
> >>
> >> Please create a proper patch header.
> >>
> >>
> >
> > Can you please let me know what is wrong specifically? The patch was
> > generated by quilt and I just added the comment in the first two lines.
> >
> > I'd prefer to fix whatever is wrong in the patch header rather than
> > regenerate the patch using a different method.
>
> Waiting for feedback on this one in order to generate a new version
> that would fix the patch header and remove the explicit
> HOST_PYTHON3_SETUPTOOLS dependency.
In general, I'd like to see the From:, Date:, Subject: headers created by
git. In this specific case, now that it is fixed upstream, I prefer the
exact patch from upstream (including these headers) and with an added
comment, that it's ab backport from upstream. That helps when the packages
is updated to a new version.
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH] python3-numpy: New package
2019-11-19 9:23 ` Michael Olbrich
@ 2019-11-19 10:15 ` Guillermo Rodriguez Garcia
2019-11-19 12:39 ` [ptxdist] [PATCH v7] " Guillermo Rodríguez
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-19 10:15 UTC (permalink / raw)
To: ptxdist
El mar., 19 nov. 2019 a las 10:23, Michael Olbrich
(<m.olbrich@pengutronix.de>) escribió:
>
> Hi,
>
> On Tue, Nov 19, 2019 at 10:10:09AM +0100, Guillermo Rodriguez Garcia wrote:
> > El vie., 15 nov. 2019 a las 21:11, Guillermo Rodriguez Garcia
> > (<guille.rodriguez@gmail.com>) escribió:
> > > El viernes, 15 de noviembre de 2019, Michael Olbrich <m.olbrich@pengutronix.de> escribió:
> > >> On Fri, Nov 15, 2019 at 09:51:25AM +0100, Guillermo Rodríguez wrote:
> > >> > NumPy is the fundamental package for scientific computing with Python.
> > >> >
> > >> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > >> > ---
> > >> > v2: Switch to PyPi URL; this removes the dependency on Cython.
> > >> > v3: Update LICENSE, add LICENSE_FILES
> > >> > v4: Update LICENSE and LICENSE_FILES with additional licenses
> > >> > v5: Removed "unknown" from LICENSE
> > >> > v6: Updated to 1.17.4, added patch to fix cross compilation
> > >> >
> > >> > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 21 +++++++
> > >> > patches/numpy-1.17.4/series | 1 +
> > >> > rules/python3-numpy.in | 10 ++++
> > >> > rules/python3-numpy.make | 57 +++++++++++++++++++
> > >> > 4 files changed, 89 insertions(+)
> > >> > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > >> > create mode 100644 patches/numpy-1.17.4/series
> > >> > create mode 100644 rules/python3-numpy.in
> > >> > create mode 100644 rules/python3-numpy.make
> > >> >
> > >> > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > >> > new file mode 100644
> > >> > index 000000000..e1cb0d878
> > >> > --- /dev/null
> > >> > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > >> > @@ -0,0 +1,21 @@
> > >> > +Fix cross-compilation for non-Intel targets.
> > >> > +See: https://github.com/numpy/numpy/issues/14861
> > >> > +
> > >> > +---
> > >>
> > >> Please create a proper patch header.
> > >>
> > >>
> > >
> > > Can you please let me know what is wrong specifically? The patch was
> > > generated by quilt and I just added the comment in the first two lines.
> > >
> > > I'd prefer to fix whatever is wrong in the patch header rather than
> > > regenerate the patch using a different method.
> >
> > Waiting for feedback on this one in order to generate a new version
> > that would fix the patch header and remove the explicit
> > HOST_PYTHON3_SETUPTOOLS dependency.
>
> In general, I'd like to see the From:, Date:, Subject: headers created by
> git. In this specific case, now that it is fixed upstream, I prefer the
> exact patch from upstream
The exact patch from upstream does not apply cleanly, that's why I
regenerated it.
> (including these headers) and with an added
> comment, that it's ab backport from upstream. That helps when the packages
> is updated to a new version.
OK.
Guillermo
>
> Michael
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [ptxdist] [PATCH v7] python3-numpy: New package
2019-11-19 10:15 ` Guillermo Rodriguez Garcia
@ 2019-11-19 12:39 ` Guillermo Rodríguez
2019-11-25 6:32 ` Michael Olbrich
0 siblings, 1 reply; 26+ messages in thread
From: Guillermo Rodríguez @ 2019-11-19 12:39 UTC (permalink / raw)
To: ptxdist; +Cc: Guillermo Rodríguez
NumPy is the fundamental package for scientific computing with Python.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
v2: Switch to PyPi URL; this removes the dependency on Cython.
v3: Update LICENSE, add LICENSE_FILES
v4: Update LICENSE and LICENSE_FILES with additional licenses
v5: Removed "unknown" from LICENSE
v6: Updated to 1.17.4, added patch to fix cross compilation
v7: Removed SETUPTOOLS dependency, reformatted sse2 patch header
.../numpy-1.17.4/0001-remove-sse2-flag.patch | 27 +++++++++
patches/numpy-1.17.4/series | 1 +
rules/python3-numpy.in | 9 +++
rules/python3-numpy.make | 57 +++++++++++++++++++
4 files changed, 94 insertions(+)
create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
create mode 100644 patches/numpy-1.17.4/series
create mode 100644 rules/python3-numpy.in
create mode 100644 rules/python3-numpy.make
diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
new file mode 100644
index 000000000..2c88b429b
--- /dev/null
+++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
@@ -0,0 +1,27 @@
+From 4708211dc86d396f30c54bf71bc7194338272637 Mon Sep 17 00:00:00 2001
+From: mattip <matti.picus@gmail.com>
+Date: Mon, 11 Nov 2019 12:48:00 -0700
+Subject: [PATCH] BUILD: remove SSE2 flag from numpy.random builds
+
+This is a backport of https://github.com/numpy/numpy/pull/14878
+
+---
+ numpy/random/setup.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/numpy/random/setup.py b/numpy/random/setup.py
+index ca01250f437..f9059d7d76a 100644
+--- a/numpy/random/setup.py
++++ b/numpy/random/setup.py
+@@ -49,11 +49,6 @@
+ elif not is_msvc:
+ # Some bit generators require c99
+ EXTRA_COMPILE_ARGS += ['-std=c99']
+- INTEL_LIKE = any(arch in platform.machine()
+- for arch in ('x86', 'i686', 'i386', 'amd64'))
+- if INTEL_LIKE:
+- # Assumes GCC or GCC-like compiler
+- EXTRA_COMPILE_ARGS += ['-msse2']
+
+ # Use legacy integer variable sizes
+ LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
new file mode 100644
index 000000000..64785c945
--- /dev/null
+++ b/patches/numpy-1.17.4/series
@@ -0,0 +1 @@
+0001-remove-sse2-flag.patch
diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
new file mode 100644
index 000000000..174a2bae1
--- /dev/null
+++ b/rules/python3-numpy.in
@@ -0,0 +1,9 @@
+## SECTION=python3
+
+config PYTHON3_NUMPY
+ tristate
+ select PYTHON3
+ prompt "python3-numpy"
+ help
+ NumPy is the fundamental package for scientific computing with
+ Python.
diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
new file mode 100644
index 000000000..6b161856b
--- /dev/null
+++ b/rules/python3-numpy.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
+
+#
+# Paths and names
+#
+PYTHON3_NUMPY_VERSION := 1.17.4
+PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe
+PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
+PYTHON3_NUMPY_SUFFIX := zip
+PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
+PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
+PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
+PYTHON3_NUMPY_LICENSE_FILES := \
+ file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \
+ file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
+ file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_NUMPY_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-numpy.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-numpy)
+ @$(call install_fixup, python3-numpy, PRIORITY, optional)
+ @$(call install_fixup, python3-numpy, SECTION, base)
+ @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
+ @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
+
+ @$(call install_glob, python3-numpy, 0, 0, -, \
+ /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
+
+ @$(call install_finish, python3-numpy)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.21.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v7] python3-numpy: New package
2019-11-19 12:39 ` [ptxdist] [PATCH v7] " Guillermo Rodríguez
@ 2019-11-25 6:32 ` Michael Olbrich
2019-11-25 9:35 ` Guillermo Rodriguez Garcia
0 siblings, 1 reply; 26+ messages in thread
From: Michael Olbrich @ 2019-11-25 6:32 UTC (permalink / raw)
To: ptxdist
On Tue, Nov 19, 2019 at 01:39:05PM +0100, Guillermo Rodríguez wrote:
> NumPy is the fundamental package for scientific computing with Python.
>
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
> v2: Switch to PyPi URL; this removes the dependency on Cython.
> v3: Update LICENSE, add LICENSE_FILES
> v4: Update LICENSE and LICENSE_FILES with additional licenses
> v5: Removed "unknown" from LICENSE
> v6: Updated to 1.17.4, added patch to fix cross compilation
> v7: Removed SETUPTOOLS dependency, reformatted sse2 patch header
>
> .../numpy-1.17.4/0001-remove-sse2-flag.patch | 27 +++++++++
> patches/numpy-1.17.4/series | 1 +
> rules/python3-numpy.in | 9 +++
> rules/python3-numpy.make | 57 +++++++++++++++++++
> 4 files changed, 94 insertions(+)
> create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> create mode 100644 patches/numpy-1.17.4/series
> create mode 100644 rules/python3-numpy.in
> create mode 100644 rules/python3-numpy.make
>
> diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> new file mode 100644
> index 000000000..2c88b429b
> --- /dev/null
> +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> @@ -0,0 +1,27 @@
> +From 4708211dc86d396f30c54bf71bc7194338272637 Mon Sep 17 00:00:00 2001
> +From: mattip <matti.picus@gmail.com>
> +Date: Mon, 11 Nov 2019 12:48:00 -0700
> +Subject: [PATCH] BUILD: remove SSE2 flag from numpy.random builds
> +
> +This is a backport of https://github.com/numpy/numpy/pull/14878
> +
> +---
> + numpy/random/setup.py | 5 -----
> + 1 file changed, 5 deletions(-)
> +
> +diff --git a/numpy/random/setup.py b/numpy/random/setup.py
> +index ca01250f437..f9059d7d76a 100644
> +--- a/numpy/random/setup.py
> ++++ b/numpy/random/setup.py
> +@@ -49,11 +49,6 @@
> + elif not is_msvc:
> + # Some bit generators require c99
> + EXTRA_COMPILE_ARGS += ['-std=c99']
> +- INTEL_LIKE = any(arch in platform.machine()
> +- for arch in ('x86', 'i686', 'i386', 'amd64'))
> +- if INTEL_LIKE:
> +- # Assumes GCC or GCC-like compiler
> +- EXTRA_COMPILE_ARGS += ['-msse2']
> +
> + # Use legacy integer variable sizes
> + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
> diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
> new file mode 100644
> index 000000000..64785c945
> --- /dev/null
> +++ b/patches/numpy-1.17.4/series
> @@ -0,0 +1 @@
> +0001-remove-sse2-flag.patch
> diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> new file mode 100644
> index 000000000..174a2bae1
> --- /dev/null
> +++ b/rules/python3-numpy.in
> @@ -0,0 +1,9 @@
> +## SECTION=python3
> +
> +config PYTHON3_NUMPY
> + tristate
> + select PYTHON3
> + prompt "python3-numpy"
> + help
> + NumPy is the fundamental package for scientific computing with
> + Python.
> diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> new file mode 100644
> index 000000000..6b161856b
> --- /dev/null
> +++ b/rules/python3-numpy.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> +
> +#
> +# Paths and names
> +#
> +PYTHON3_NUMPY_VERSION := 1.17.4
> +PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe
> +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> +PYTHON3_NUMPY_SUFFIX := zip
> +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
BSD is not a valid SPDX identifier. Which license does this refer to?
No need to resent it, I can do a fixup, but I need to know what to change.
Michael
> +PYTHON3_NUMPY_LICENSE_FILES := \
> + file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \
> + file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
> + file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_NUMPY_CONF_TOOL := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-numpy.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, python3-numpy)
> + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> + @$(call install_fixup, python3-numpy, SECTION, base)
> + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
> + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> +
> + @$(call install_glob, python3-numpy, 0, 0, -, \
> + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> +
> + @$(call install_finish, python3-numpy)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.21.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [ptxdist] [PATCH v7] python3-numpy: New package
2019-11-25 6:32 ` Michael Olbrich
@ 2019-11-25 9:35 ` Guillermo Rodriguez Garcia
0 siblings, 0 replies; 26+ messages in thread
From: Guillermo Rodriguez Garcia @ 2019-11-25 9:35 UTC (permalink / raw)
To: ptxdist
Hi Michael,
El lun., 25 nov. 2019 a las 7:33, Michael Olbrich
(<m.olbrich@pengutronix.de>) escribió:
>
> On Tue, Nov 19, 2019 at 01:39:05PM +0100, Guillermo Rodríguez wrote:
> > NumPy is the fundamental package for scientific computing with Python.
> >
> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > ---
> > v2: Switch to PyPi URL; this removes the dependency on Cython.
> > v3: Update LICENSE, add LICENSE_FILES
> > v4: Update LICENSE and LICENSE_FILES with additional licenses
> > v5: Removed "unknown" from LICENSE
> > v6: Updated to 1.17.4, added patch to fix cross compilation
> > v7: Removed SETUPTOOLS dependency, reformatted sse2 patch header
> >
> > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 27 +++++++++
> > patches/numpy-1.17.4/series | 1 +
> > rules/python3-numpy.in | 9 +++
> > rules/python3-numpy.make | 57 +++++++++++++++++++
> > 4 files changed, 94 insertions(+)
> > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > create mode 100644 patches/numpy-1.17.4/series
> > create mode 100644 rules/python3-numpy.in
> > create mode 100644 rules/python3-numpy.make
> >
> > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > new file mode 100644
> > index 000000000..2c88b429b
> > --- /dev/null
> > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > @@ -0,0 +1,27 @@
> > +From 4708211dc86d396f30c54bf71bc7194338272637 Mon Sep 17 00:00:00 2001
> > +From: mattip <matti.picus@gmail.com>
> > +Date: Mon, 11 Nov 2019 12:48:00 -0700
> > +Subject: [PATCH] BUILD: remove SSE2 flag from numpy.random builds
> > +
> > +This is a backport of https://github.com/numpy/numpy/pull/14878
> > +
> > +---
> > + numpy/random/setup.py | 5 -----
> > + 1 file changed, 5 deletions(-)
> > +
> > +diff --git a/numpy/random/setup.py b/numpy/random/setup.py
> > +index ca01250f437..f9059d7d76a 100644
> > +--- a/numpy/random/setup.py
> > ++++ b/numpy/random/setup.py
> > +@@ -49,11 +49,6 @@
> > + elif not is_msvc:
> > + # Some bit generators require c99
> > + EXTRA_COMPILE_ARGS += ['-std=c99']
> > +- INTEL_LIKE = any(arch in platform.machine()
> > +- for arch in ('x86', 'i686', 'i386', 'amd64'))
> > +- if INTEL_LIKE:
> > +- # Assumes GCC or GCC-like compiler
> > +- EXTRA_COMPILE_ARGS += ['-msse2']
> > +
> > + # Use legacy integer variable sizes
> > + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
> > diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
> > new file mode 100644
> > index 000000000..64785c945
> > --- /dev/null
> > +++ b/patches/numpy-1.17.4/series
> > @@ -0,0 +1 @@
> > +0001-remove-sse2-flag.patch
> > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> > new file mode 100644
> > index 000000000..174a2bae1
> > --- /dev/null
> > +++ b/rules/python3-numpy.in
> > @@ -0,0 +1,9 @@
> > +## SECTION=python3
> > +
> > +config PYTHON3_NUMPY
> > + tristate
> > + select PYTHON3
> > + prompt "python3-numpy"
> > + help
> > + NumPy is the fundamental package for scientific computing with
> > + Python.
> > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make
> > new file mode 100644
> > index 000000000..6b161856b
> > --- /dev/null
> > +++ b/rules/python3-numpy.make
> > @@ -0,0 +1,57 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2019 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy
> > +
> > +#
> > +# Paths and names
> > +#
> > +PYTHON3_NUMPY_VERSION := 1.17.4
> > +PYTHON3_NUMPY_MD5 := d7d3563cca0b99ba68a3f064a9e46ebe
> > +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION)
> > +PYTHON3_NUMPY_SUFFIX := zip
> > +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX)
> > +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY)
> > +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT
>
> BSD is not a valid SPDX identifier. Which license does this refer to?
> No need to resent it, I can do a fixup, but I need to know what to change.
Not sure anymore, perhaps that's a leftover from a previous version of
the patch (since I switched from 1.16.1 to 1.17.4, and some licenses
have changed).
I rechecked everything from scratch and I see the following:
- Main numpy license is BSD-3-Clause. License text is here:
https://github.com/numpy/numpy/blob/master/LICENSE.txt
- According to https://github.com/numpy/numpy/blob/master/LICENSES_bundled.txt,
the following additional licenses apply to certain bundled components:
Name: lapack-lite
Files: numpy/linalg/lapack_lite/*
License: 3-clause BSD
For details, see numpy/linalg/lapack_lite/LICENSE.txt
-> So 3-clause BSD again
Name: tempita
Files: tools/npy_tempita/*
License: BSD derived
For details, see tools/npy_tempita/license.txt
-> Despite the comment, this is actually the MIT license; see:
https://github.com/numpy/numpy/blob/master/tools/npy_tempita/license.txt
Name: dragon4
Files: numpy/core/src/multiarray/dragon4.c
License: MIT
For license text, see numpy/core/src/multiarray/dragon4.c
-> MIT license again
So I'd say that PYTHON3_NUMPY_LICENSE can be just "BSD-3-Clause AND MIT"
Guillermo
>
> Michael
>
> > +PYTHON3_NUMPY_LICENSE_FILES := \
> > + file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1 \
> > + file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \
> > + file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=20;md5=7f70862b43e17922c5adf18ec84fb720
> > +
> > +
> > +# ----------------------------------------------------------------------------
> > +# Prepare
> > +# ----------------------------------------------------------------------------
> > +
> > +PYTHON3_NUMPY_CONF_TOOL := python3
> > +
> > +# ----------------------------------------------------------------------------
> > +# Target-Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/python3-numpy.targetinstall:
> > + @$(call targetinfo)
> > +
> > + @$(call install_init, python3-numpy)
> > + @$(call install_fixup, python3-numpy, PRIORITY, optional)
> > + @$(call install_fixup, python3-numpy, SECTION, base)
> > + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez <guille.rodriguez@gmail.com>")
> > + @$(call install_fixup, python3-numpy, DESCRIPTION, missing)
> > +
> > + @$(call install_glob, python3-numpy, 0, 0, -, \
> > + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py)
> > +
> > + @$(call install_finish, python3-numpy)
> > +
> > + @$(call touch)
> > +
> > +# vim: syntax=make
> > --
> > 2.21.0
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2019-11-25 9:35 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-11 15:13 [ptxdist] [PATCH] python3-numpy: New package Guillermo Rodríguez
2019-11-12 9:32 ` [ptxdist] [PATCH v2] " Guillermo Rodríguez
2019-11-12 9:51 ` [ptxdist] [PATCH] " Roland Hieber
2019-11-12 11:48 ` Guillermo Rodriguez Garcia
2019-11-12 11:51 ` [ptxdist] [PATCH v3] " Guillermo Rodríguez
2019-11-13 9:36 ` Roland Hieber
2019-11-14 9:36 ` Guillermo Rodriguez Garcia
2019-11-14 9:56 ` Roland Hieber
2019-11-14 10:01 ` Guillermo Rodriguez Garcia
2019-11-14 10:03 ` [ptxdist] [PATCH v4] " Guillermo Rodríguez
2019-11-14 10:07 ` [ptxdist] [PATCH v3] " Guillermo Rodriguez Garcia
2019-11-14 10:09 ` [ptxdist] [PATCH v5] " Guillermo Rodríguez
2019-11-14 20:24 ` Ladislav Michl
2019-11-14 11:18 ` [ptxdist] [PATCH v3] " Roland Hieber
2019-11-14 11:40 ` Guillermo Rodriguez Garcia
2019-11-14 13:31 ` Roland Hieber
2019-11-14 18:50 ` Guillermo Rodriguez Garcia
2019-11-15 8:51 ` [ptxdist] [PATCH v6] " Guillermo Rodríguez
2019-11-15 14:19 ` Michael Olbrich
2019-11-15 20:11 ` [ptxdist] [PATCH] " Guillermo Rodriguez Garcia
2019-11-19 9:10 ` Guillermo Rodriguez Garcia
2019-11-19 9:23 ` Michael Olbrich
2019-11-19 10:15 ` Guillermo Rodriguez Garcia
2019-11-19 12:39 ` [ptxdist] [PATCH v7] " Guillermo Rodríguez
2019-11-25 6:32 ` Michael Olbrich
2019-11-25 9:35 ` Guillermo Rodriguez Garcia
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox