* [gentoo-commits] repo/gentoo:master commit in: dev-python/pythran/files/, dev-python/pythran/
@ 2021-11-05 18:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-11-05 18:07 UTC (permalink / raw
To: gentoo-commits
commit: b16f59f577ac9a61054a3ccf0eb057ca98dc6875
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 18:07:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 18:07:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b16f59f5
dev-python/pythran: fix tests (drop -Werror)
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/pythran/files/pythran-0.10.0-tests-werror.patch | 11 +++++++++++
dev-python/pythran/pythran-0.10.0.ebuild | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/dev-python/pythran/files/pythran-0.10.0-tests-werror.patch b/dev-python/pythran/files/pythran-0.10.0-tests-werror.patch
new file mode 100644
index 00000000000..17c0630a5d1
--- /dev/null
+++ b/dev-python/pythran/files/pythran-0.10.0-tests-werror.patch
@@ -0,0 +1,11 @@
+--- a/pythran/tests/__init__.py
++++ b/pythran/tests/__init__.py
+@@ -71,7 +71,7 @@ class TestEnv(unittest.TestCase):
+
+ module = pytest.mark.module
+ # default options used for the c++ compiler
+- PYTHRAN_CXX_FLAGS = ['-O0', '-Wall', '-Werror', '-UNDEBUG',
++ PYTHRAN_CXX_FLAGS = ['-O0', '-Wall', '-UNDEBUG',
+ '-Wno-unused-function',
+ '-Wno-int-in-bool-context',
+ '-Wno-unknown-warning-option',
diff --git a/dev-python/pythran/pythran-0.10.0.ebuild b/dev-python/pythran/pythran-0.10.0.ebuild
index 549382ff6f9..ce0bf29dc3f 100644
--- a/dev-python/pythran/pythran-0.10.0.ebuild
+++ b/dev-python/pythran/pythran-0.10.0.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
+)
+
src_prepare() {
sed -i -e '/pytest-runner/d' setup.py || die
distutils-r1_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pythran/files/, dev-python/pythran/
@ 2022-10-28 11:50 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-10-28 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 09eab4d4c13faf484c7622c51ea14ba0b53d6877
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 11:50:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 11:50:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09eab4d4
dev-python/pythran: fix installed headers for GCC 13
Closes: https://bugs.gentoo.org/878527
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../pythran/files/pythran-0.12.0-gcc13.patch | 36 ++++++++++++++++++++++
...n-0.12.0-r1.ebuild => pythran-0.12.0-r2.ebuild} | 1 +
2 files changed, 37 insertions(+)
diff --git a/dev-python/pythran/files/pythran-0.12.0-gcc13.patch b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
new file mode 100644
index 000000000000..d7b9f28f0f45
--- /dev/null
+++ b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
@@ -0,0 +1,36 @@
+https://github.com/serge-sans-paille/pythran/pull/2029
+
+From 13a89edad477077331ae8071eadf239e88adea0c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 28 Oct 2022 12:47:35 +0100
+Subject: [PATCH] Fix build with GCC 13 (missing <cstdint> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When building scipy, one gets:
+```
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:304:17: error: ‘uint8_t’ was not declared in this scope
+ 304 | SCALAR_COMBINER(uint8_t)
+ | ^~~~~~~
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:300:21: note: in definition of macro ‘SCALAR_COMBINER’
+ 300 | struct __combined<Type, Type> { \
+ | ^~~~
+/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:5:1: note: ‘uint8_t’ is defined in header ‘<cstdint>’; did you forget to ‘#include <cstdint>’?
+ 4 | #include "pythonic/include/types/traits.hpp"
+ +++ |+#include <cstdint>
+```
+
+Bug: https://bugs.gentoo.org/878527
+--- a/pythran/pythonic/include/types/combined.hpp
++++ b/pythran/pythonic/include/types/combined.hpp
+@@ -1,6 +1,8 @@
+ #ifndef PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
+ #define PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
+
++#include <cstdint>
++
+ #include "pythonic/include/types/traits.hpp"
+ PYTHONIC_NS_BEGIN
+ namespace types
+
diff --git a/dev-python/pythran/pythran-0.12.0-r1.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
similarity index 97%
rename from dev-python/pythran/pythran-0.12.0-r1.ebuild
rename to dev-python/pythran/pythran-0.12.0-r2.ebuild
index 585d64925bd1..3a8d913b453c 100644
--- a/dev-python/pythran/pythran-0.12.0-r1.ebuild
+++ b/dev-python/pythran/pythran-0.12.0-r2.ebuild
@@ -49,6 +49,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
+ "${FILESDIR}"/${PN}-0.12.0-gcc13.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pythran/files/, dev-python/pythran/
@ 2023-04-01 17:43 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-04-01 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 60a0f44173219f060a17242bef1797c647c5e298
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 1 17:42:23 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 17:42:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a0f441
dev-python/pythran: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pythran/Manifest | 2 -
.../files/pythran-0.10.0-tests-werror.patch | 11 ----
.../pythran/files/pythran-0.12.0-gcc13.patch | 36 ------------
dev-python/pythran/pythran-0.11.0.ebuild | 51 -----------------
dev-python/pythran/pythran-0.12.0-r2.ebuild | 66 ----------------------
5 files changed, 166 deletions(-)
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index f24fa715283b..05ff64598680 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,3 +1 @@
-DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
-DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
DIST pythran-0.12.1.gh.tar.gz 3631063 BLAKE2B c680639a88cd63398f88ee6f5325da288c06549bfef2ee649e27dd92114a2690f54fb3da730c4eb30ff9b7ef297c219bafa5f7f7153b7710d348859a04716e84 SHA512 05c4e1d03de3eebccbb915e13c70a36de293152aece58066f2d91d483d3ac920d61c7a76adcb2337f60e637734451775f0fc61341b0ef9fc4f074a752e39de9d
diff --git a/dev-python/pythran/files/pythran-0.10.0-tests-werror.patch b/dev-python/pythran/files/pythran-0.10.0-tests-werror.patch
deleted file mode 100644
index 17c0630a5d1e..000000000000
--- a/dev-python/pythran/files/pythran-0.10.0-tests-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pythran/tests/__init__.py
-+++ b/pythran/tests/__init__.py
-@@ -71,7 +71,7 @@ class TestEnv(unittest.TestCase):
-
- module = pytest.mark.module
- # default options used for the c++ compiler
-- PYTHRAN_CXX_FLAGS = ['-O0', '-Wall', '-Werror', '-UNDEBUG',
-+ PYTHRAN_CXX_FLAGS = ['-O0', '-Wall', '-UNDEBUG',
- '-Wno-unused-function',
- '-Wno-int-in-bool-context',
- '-Wno-unknown-warning-option',
diff --git a/dev-python/pythran/files/pythran-0.12.0-gcc13.patch b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
deleted file mode 100644
index d7b9f28f0f45..000000000000
--- a/dev-python/pythran/files/pythran-0.12.0-gcc13.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/serge-sans-paille/pythran/pull/2029
-
-From 13a89edad477077331ae8071eadf239e88adea0c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 28 Oct 2022 12:47:35 +0100
-Subject: [PATCH] Fix build with GCC 13 (missing <cstdint> include)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building scipy, one gets:
-```
-/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:304:17: error: ‘uint8_t’ was not declared in this scope
- 304 | SCALAR_COMBINER(uint8_t)
- | ^~~~~~~
-/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:300:21: note: in definition of macro ‘SCALAR_COMBINER’
- 300 | struct __combined<Type, Type> { \
- | ^~~~
-/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:5:1: note: ‘uint8_t’ is defined in header ‘<cstdint>’; did you forget to ‘#include <cstdint>’?
- 4 | #include "pythonic/include/types/traits.hpp"
- +++ |+#include <cstdint>
-```
-
-Bug: https://bugs.gentoo.org/878527
---- a/pythran/pythonic/include/types/combined.hpp
-+++ b/pythran/pythonic/include/types/combined.hpp
-@@ -1,6 +1,8 @@
- #ifndef PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
- #define PYTHONIC_INCLUDE_TYPES_COMBINED_HPP
-
-+#include <cstdint>
-+
- #include "pythonic/include/types/traits.hpp"
- PYTHONIC_NS_BEGIN
- namespace types
-
diff --git a/dev-python/pythran/pythran-0.11.0.ebuild b/dev-python/pythran/pythran-0.11.0.ebuild
deleted file mode 100644
index 05448449ad1d..000000000000
--- a/dev-python/pythran/pythran-0.11.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1 multiprocessing
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Ahead of Time compiler for numeric kernels"
-HOMEPAGE="
- https://pypi.org/project/pythran/
- https://github.com/serge-sans-paille/pythran/"
-SRC_URI="
- https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
- -> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
- =dev-python/beniget-0.4*[${PYTHON_USEDEP}]
- =dev-python/gast-0.5*[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=dev-python/ply-3.4[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/cblas
- )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
-)
-
-src_prepare() {
- sed -i -e '/pytest-runner/d' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local -x COLUMNS=80
- epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pythran/pythran-0.12.0-r2.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
deleted file mode 100644
index 9f44a7f1d5d7..000000000000
--- a/dev-python/pythran/pythran-0.12.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{9..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 )
-
-inherit distutils-r1 multiprocessing
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Ahead of Time compiler for numeric kernels"
-HOMEPAGE="
- https://pypi.org/project/pythran/
- https://github.com/serge-sans-paille/pythran/
-"
-SRC_URI="
- https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
- dev-libs/boost
- =dev-python/beniget-0.4*[${PYTHON_USEDEP}]
- =dev-python/gast-0.5*[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=dev-python/ply-3.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- $(python_gen_cond_dep '
- dev-python/ipython[${PYTHON_USEDEP}]
- ' "${PYTHON_TESTED[@]}")
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/cblas
- !!dev-python/setuptools-declarative-requirements
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
- "${FILESDIR}"/${PN}-0.12.0-gcc13.patch
-)
-
-src_configure() {
- # TODO: package xsimd then set no_xsimd = True
- cat >> setup.cfg <<-EOF
- [build_py]
- no_boost = True
- EOF
-}
-
-python_test() {
- local -x COLUMNS=80
- epytest -n "$(makeopts_jobs)"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-01 17:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 11:50 [gentoo-commits] repo/gentoo:master commit in: dev-python/pythran/files/, dev-python/pythran/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-01 17:43 Michał Górny
2021-11-05 18:07 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox