* [gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/
@ 2022-02-17 19:03 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2022-02-17 19:03 UTC (permalink / raw
To: gentoo-commits
commit: d276b232bbefd7de4f3bba2c8db624e632f90fa3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 18:45:17 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 19:03:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d276b232
dev-python/pybind11: Bump to 2.9.1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pybind11/Manifest | 1 +
.../pybind11/files/pybind11-2.9.1-numpy-1.22.patch | 173 +++++++++++++++++++++
dev-python/pybind11/pybind11-2.9.1.ebuild | 57 +++++++
3 files changed, 231 insertions(+)
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 552d3e34ffb8..042de689a969 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1 +1,2 @@
DIST pybind11-2.9.0.tar.gz 698784 BLAKE2B bfbe173d580131e445d759bd9b1a8929ceb9fc357a1ed8873aa8024fb9226a37bb97293dc0189a67ae61a232f3790ca6f635a30d0a0401c867cde98f1010438c SHA512 87184c9e09e1340f2d34786a66560fe77684a3629b517f78321073a1f0dfdb766365d3698dcf6f08e5141b1f4da50ec917e61b36538e5a1ec9fd1b68f29cd396
+DIST pybind11-2.9.1.tar.gz 703882 BLAKE2B cc162332b637f81ea5d3098a2e9882f16a9c889e83e6ccd36d2a2da2f90361d8d188abd559f2313b45ff1de7d9ee56ee198c1193b47829d1fdf6d8871ce35b0c SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588
diff --git a/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch b/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
new file mode 100644
index 000000000000..c7f16fb53364
--- /dev/null
+++ b/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
@@ -0,0 +1,173 @@
+From 116f8c7db5a11d0e1e7830de3f2bbf3e5ed1316c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 3 Feb 2022 17:41:45 +0100
+Subject: [PATCH 1/2] test: Strip whitespace when comparing numpy dtypes for
+ 1.22 compat
+
+Strip whitespace when comparing numpy dtype str() in order to preserve
+test compatibility with both numpy 1.22 and older versions whose output
+differ by whitespace.
+
+Fixes #3680
+---
+ tests/test_numpy_dtypes.py | 44 +++++++++++++++++++-------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
+index 06e578329e..43480334aa 100644
+--- a/tests/test_numpy_dtypes.py
++++ b/tests/test_numpy_dtypes.py
+@@ -32,8 +32,8 @@ def dt_fmt():
+ e = "<" if byteorder == "little" else ">"
+ return (
+ "{{'names':['bool_','uint_','float_','ldbl_'],"
+- " 'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
+- " 'offsets':[0,4,8,{}], 'itemsize':{}}}"
++ "'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
++ "'offsets':[0,4,8,{}],'itemsize':{}}}"
+ )
+
+
+@@ -46,7 +46,7 @@ def simple_dtype_fmt():
+ def packed_dtype_fmt():
+ from sys import byteorder
+
+- return "[('bool_', '?'), ('uint_', '{e}u4'), ('float_', '{e}f4'), ('ldbl_', '{e}f{}')]".format(
++ return "[('bool_','?'),('uint_','{e}u4'),('float_','{e}f4'),('ldbl_','{e}f{}')]".format(
+ np.dtype("longdouble").itemsize, e="<" if byteorder == "little" else ">"
+ )
+
+@@ -77,7 +77,7 @@ def partial_nested_fmt():
+ partial_size = partial_ld_off + ld.itemsize
+ partial_end_padding = partial_size % np.dtype("uint64").alignment
+ partial_nested_size = partial_nested_off * 2 + partial_size + partial_end_padding
+- return "{{'names':['a'], 'formats':[{}], 'offsets':[{}], 'itemsize':{}}}".format(
++ return "{{'names':['a'],'formats':[{}],'offsets':[{}],'itemsize':{}}}".format(
+ partial_dtype_fmt(), partial_nested_off, partial_nested_size
+ )
+
+@@ -123,25 +123,25 @@ def test_dtype(simple_dtype):
+
+ e = "<" if byteorder == "little" else ">"
+
+- assert m.print_dtypes() == [
++ assert [x.replace(' ', '') for x in m.print_dtypes()] == [
+ simple_dtype_fmt(),
+ packed_dtype_fmt(),
+- "[('a', {}), ('b', {})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
++ "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
+ partial_dtype_fmt(),
+ partial_nested_fmt(),
+- "[('a', 'S3'), ('b', 'S3')]",
++ "[('a','S3'),('b','S3')]",
+ (
+- "{{'names':['a','b','c','d'], "
+- + "'formats':[('S4', (3,)),('"
++ "{{'names':['a','b','c','d'],"
++ + "'formats':[('S4',(3,)),('"
+ + e
+- + "i4', (2,)),('u1', (3,)),('"
++ + "i4',(2,)),('u1',(3,)),('"
+ + e
+- + "f4', (4, 2))], "
+- + "'offsets':[0,12,20,24], 'itemsize':56}}"
++ + "f4',(4,2))],"
++ + "'offsets':[0,12,20,24],'itemsize':56}}"
+ ).format(e=e),
+- "[('e1', '" + e + "i8'), ('e2', 'u1')]",
+- "[('x', 'i1'), ('y', '" + e + "u8')]",
+- "[('cflt', '" + e + "c8'), ('cdbl', '" + e + "c16')]",
++ "[('e1','" + e + "i8'),('e2','u1')]",
++ "[('x','i1'),('y','" + e + "u8')]",
++ "[('cflt','" + e + "c8'),('cdbl','" + e + "c16')]",
+ ]
+
+ d1 = np.dtype(
+@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
+ ]
+
+ arr = m.create_rec_partial(3)
+- assert str(arr.dtype) == partial_dtype_fmt()
++ assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
+ partial_dtype = arr.dtype
+ assert "" not in arr.dtype.fields
+ assert partial_dtype.itemsize > simple_dtype.itemsize
+@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
+ assert_equal(arr, elements, packed_dtype)
+
+ arr = m.create_rec_partial_nested(3)
+- assert str(arr.dtype) == partial_nested_fmt()
++ assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
+ assert "" not in arr.dtype.fields
+ assert "" not in arr.dtype.fields["a"][0].fields
+ assert arr.dtype.itemsize > partial_dtype.itemsize
+@@ -285,12 +285,12 @@ def test_array_array():
+ e = "<" if byteorder == "little" else ">"
+
+ arr = m.create_array_array(3)
+- assert str(arr.dtype) == (
+- "{{'names':['a','b','c','d'], "
+- + "'formats':[('S4', (3,)),('"
++ assert str(arr.dtype).replace(' ', '') == (
++ "{{'names':['a','b','c','d'],"
++ + "'formats':[('S4',(3,)),('"
+ + e
+- + "i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], "
+- + "'offsets':[0,12,20,24], 'itemsize':56}}"
++ + "i4',(2,)),('u1',(3,)),('{e}f4',(4,2))],"
++ + "'offsets':[0,12,20,24],'itemsize':56}}"
+ ).format(e=e)
+ assert m.print_array_array(arr) == [
+ "a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1},"
+
+From 2c4a1e98e56a257fbc8dd0e8644181acd6d7e5a7 Mon Sep 17 00:00:00 2001
+From: "pre-commit-ci[bot]"
+ <66853113+pre-commit-ci[bot]@users.noreply.github.com>
+Date: Thu, 3 Feb 2022 16:45:33 +0000
+Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks
+
+for more information, see https://pre-commit.ci
+---
+ tests/test_numpy_dtypes.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
+index 43480334aa..0098eccb87 100644
+--- a/tests/test_numpy_dtypes.py
++++ b/tests/test_numpy_dtypes.py
+@@ -123,7 +123,7 @@ def test_dtype(simple_dtype):
+
+ e = "<" if byteorder == "little" else ">"
+
+- assert [x.replace(' ', '') for x in m.print_dtypes()] == [
++ assert [x.replace(" ", "") for x in m.print_dtypes()] == [
+ simple_dtype_fmt(),
+ packed_dtype_fmt(),
+ "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
+@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
+ ]
+
+ arr = m.create_rec_partial(3)
+- assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
++ assert str(arr.dtype).replace(" ", "") == partial_dtype_fmt()
+ partial_dtype = arr.dtype
+ assert "" not in arr.dtype.fields
+ assert partial_dtype.itemsize > simple_dtype.itemsize
+@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
+ assert_equal(arr, elements, packed_dtype)
+
+ arr = m.create_rec_partial_nested(3)
+- assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
++ assert str(arr.dtype).replace(" ", "") == partial_nested_fmt()
+ assert "" not in arr.dtype.fields
+ assert "" not in arr.dtype.fields["a"][0].fields
+ assert arr.dtype.itemsize > partial_dtype.itemsize
+@@ -285,7 +285,7 @@ def test_array_array():
+ e = "<" if byteorder == "little" else ">"
+
+ arr = m.create_array_array(3)
+- assert str(arr.dtype).replace(' ', '') == (
++ assert str(arr.dtype).replace(" ", "") == (
+ "{{'names':['a','b','c','d'],"
+ + "'formats':[('S4',(3,)),('"
+ + e
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
new file mode 100644
index 000000000000..f93c74dafdd7
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ export PYBIND11_USE_CMAKE=1
+ cmake_src_prepare
+
+ local PATCHES=(
+ # https://github.com/pybind/pybind11/pull/3682
+ "${FILESDIR}"/${P}-numpy-1.22.patch
+ )
+ distutils-r1_python_prepare_all
+}
+
+python_configure() {
+ local mycmakeargs=(
+ # disable forced lto
+ -DPYBIND11_LTO_CXX_FLAGS=
+ -DPYBIND11_INSTALL=ON
+ -DPYBIND11_TEST=$(usex test)
+ )
+ cmake_src_configure
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ # Compilation only does anything for tests
+ use test && cmake_src_compile
+}
+
+python_test() {
+ cmake_build check
+}
+
+python_install() {
+ distutils-r1_python_install
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/
@ 2022-05-05 7:09 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2022-05-05 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 8d5f8a5f07136ea4c57c25f9d66f50ae49bc0fa8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 06:59:37 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 5 07:09:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5f8a5f
dev-python/pybind11: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pybind11/Manifest | 1 -
.../pybind11/files/pybind11-2.9.1-numpy-1.22.patch | 173 ---------------------
dev-python/pybind11/pybind11-2.9.1.ebuild | 57 -------
3 files changed, 231 deletions(-)
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index a3808f1e9433..4456f619d9e1 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,2 +1 @@
-DIST pybind11-2.9.1.tar.gz 703882 BLAKE2B cc162332b637f81ea5d3098a2e9882f16a9c889e83e6ccd36d2a2da2f90361d8d188abd559f2313b45ff1de7d9ee56ee198c1193b47829d1fdf6d8871ce35b0c SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588
DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
diff --git a/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch b/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
deleted file mode 100644
index c7f16fb53364..000000000000
--- a/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 116f8c7db5a11d0e1e7830de3f2bbf3e5ed1316c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 3 Feb 2022 17:41:45 +0100
-Subject: [PATCH 1/2] test: Strip whitespace when comparing numpy dtypes for
- 1.22 compat
-
-Strip whitespace when comparing numpy dtype str() in order to preserve
-test compatibility with both numpy 1.22 and older versions whose output
-differ by whitespace.
-
-Fixes #3680
----
- tests/test_numpy_dtypes.py | 44 +++++++++++++++++++-------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
-index 06e578329e..43480334aa 100644
---- a/tests/test_numpy_dtypes.py
-+++ b/tests/test_numpy_dtypes.py
-@@ -32,8 +32,8 @@ def dt_fmt():
- e = "<" if byteorder == "little" else ">"
- return (
- "{{'names':['bool_','uint_','float_','ldbl_'],"
-- " 'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
-- " 'offsets':[0,4,8,{}], 'itemsize':{}}}"
-+ "'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
-+ "'offsets':[0,4,8,{}],'itemsize':{}}}"
- )
-
-
-@@ -46,7 +46,7 @@ def simple_dtype_fmt():
- def packed_dtype_fmt():
- from sys import byteorder
-
-- return "[('bool_', '?'), ('uint_', '{e}u4'), ('float_', '{e}f4'), ('ldbl_', '{e}f{}')]".format(
-+ return "[('bool_','?'),('uint_','{e}u4'),('float_','{e}f4'),('ldbl_','{e}f{}')]".format(
- np.dtype("longdouble").itemsize, e="<" if byteorder == "little" else ">"
- )
-
-@@ -77,7 +77,7 @@ def partial_nested_fmt():
- partial_size = partial_ld_off + ld.itemsize
- partial_end_padding = partial_size % np.dtype("uint64").alignment
- partial_nested_size = partial_nested_off * 2 + partial_size + partial_end_padding
-- return "{{'names':['a'], 'formats':[{}], 'offsets':[{}], 'itemsize':{}}}".format(
-+ return "{{'names':['a'],'formats':[{}],'offsets':[{}],'itemsize':{}}}".format(
- partial_dtype_fmt(), partial_nested_off, partial_nested_size
- )
-
-@@ -123,25 +123,25 @@ def test_dtype(simple_dtype):
-
- e = "<" if byteorder == "little" else ">"
-
-- assert m.print_dtypes() == [
-+ assert [x.replace(' ', '') for x in m.print_dtypes()] == [
- simple_dtype_fmt(),
- packed_dtype_fmt(),
-- "[('a', {}), ('b', {})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
-+ "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
- partial_dtype_fmt(),
- partial_nested_fmt(),
-- "[('a', 'S3'), ('b', 'S3')]",
-+ "[('a','S3'),('b','S3')]",
- (
-- "{{'names':['a','b','c','d'], "
-- + "'formats':[('S4', (3,)),('"
-+ "{{'names':['a','b','c','d'],"
-+ + "'formats':[('S4',(3,)),('"
- + e
-- + "i4', (2,)),('u1', (3,)),('"
-+ + "i4',(2,)),('u1',(3,)),('"
- + e
-- + "f4', (4, 2))], "
-- + "'offsets':[0,12,20,24], 'itemsize':56}}"
-+ + "f4',(4,2))],"
-+ + "'offsets':[0,12,20,24],'itemsize':56}}"
- ).format(e=e),
-- "[('e1', '" + e + "i8'), ('e2', 'u1')]",
-- "[('x', 'i1'), ('y', '" + e + "u8')]",
-- "[('cflt', '" + e + "c8'), ('cdbl', '" + e + "c16')]",
-+ "[('e1','" + e + "i8'),('e2','u1')]",
-+ "[('x','i1'),('y','" + e + "u8')]",
-+ "[('cflt','" + e + "c8'),('cdbl','" + e + "c16')]",
- ]
-
- d1 = np.dtype(
-@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
- ]
-
- arr = m.create_rec_partial(3)
-- assert str(arr.dtype) == partial_dtype_fmt()
-+ assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
- partial_dtype = arr.dtype
- assert "" not in arr.dtype.fields
- assert partial_dtype.itemsize > simple_dtype.itemsize
-@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
- assert_equal(arr, elements, packed_dtype)
-
- arr = m.create_rec_partial_nested(3)
-- assert str(arr.dtype) == partial_nested_fmt()
-+ assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
- assert "" not in arr.dtype.fields
- assert "" not in arr.dtype.fields["a"][0].fields
- assert arr.dtype.itemsize > partial_dtype.itemsize
-@@ -285,12 +285,12 @@ def test_array_array():
- e = "<" if byteorder == "little" else ">"
-
- arr = m.create_array_array(3)
-- assert str(arr.dtype) == (
-- "{{'names':['a','b','c','d'], "
-- + "'formats':[('S4', (3,)),('"
-+ assert str(arr.dtype).replace(' ', '') == (
-+ "{{'names':['a','b','c','d'],"
-+ + "'formats':[('S4',(3,)),('"
- + e
-- + "i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], "
-- + "'offsets':[0,12,20,24], 'itemsize':56}}"
-+ + "i4',(2,)),('u1',(3,)),('{e}f4',(4,2))],"
-+ + "'offsets':[0,12,20,24],'itemsize':56}}"
- ).format(e=e)
- assert m.print_array_array(arr) == [
- "a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1},"
-
-From 2c4a1e98e56a257fbc8dd0e8644181acd6d7e5a7 Mon Sep 17 00:00:00 2001
-From: "pre-commit-ci[bot]"
- <66853113+pre-commit-ci[bot]@users.noreply.github.com>
-Date: Thu, 3 Feb 2022 16:45:33 +0000
-Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks
-
-for more information, see https://pre-commit.ci
----
- tests/test_numpy_dtypes.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
-index 43480334aa..0098eccb87 100644
---- a/tests/test_numpy_dtypes.py
-+++ b/tests/test_numpy_dtypes.py
-@@ -123,7 +123,7 @@ def test_dtype(simple_dtype):
-
- e = "<" if byteorder == "little" else ">"
-
-- assert [x.replace(' ', '') for x in m.print_dtypes()] == [
-+ assert [x.replace(" ", "") for x in m.print_dtypes()] == [
- simple_dtype_fmt(),
- packed_dtype_fmt(),
- "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
-@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
- ]
-
- arr = m.create_rec_partial(3)
-- assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
-+ assert str(arr.dtype).replace(" ", "") == partial_dtype_fmt()
- partial_dtype = arr.dtype
- assert "" not in arr.dtype.fields
- assert partial_dtype.itemsize > simple_dtype.itemsize
-@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
- assert_equal(arr, elements, packed_dtype)
-
- arr = m.create_rec_partial_nested(3)
-- assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
-+ assert str(arr.dtype).replace(" ", "") == partial_nested_fmt()
- assert "" not in arr.dtype.fields
- assert "" not in arr.dtype.fields["a"][0].fields
- assert arr.dtype.itemsize > partial_dtype.itemsize
-@@ -285,7 +285,7 @@ def test_array_array():
- e = "<" if byteorder == "little" else ">"
-
- arr = m.create_array_array(3)
-- assert str(arr.dtype).replace(' ', '') == (
-+ assert str(arr.dtype).replace(" ", "") == (
- "{{'names':['a','b','c','d'],"
- + "'formats':[('S4',(3,)),('"
- + e
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
deleted file mode 100644
index 1db1018861b4..000000000000
--- a/dev-python/pybind11/pybind11-2.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
- dev-cpp/eigen:3
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- export PYBIND11_USE_CMAKE=1
- cmake_src_prepare
-
- local PATCHES=(
- # https://github.com/pybind/pybind11/pull/3682
- "${FILESDIR}"/${P}-numpy-1.22.patch
- )
- distutils-r1_python_prepare_all
-}
-
-python_configure() {
- local mycmakeargs=(
- # disable forced lto
- -DPYBIND11_LTO_CXX_FLAGS=
- -DPYBIND11_INSTALL=ON
- -DPYBIND11_TEST=$(usex test)
- )
- cmake_src_configure
-}
-
-python_compile() {
- distutils-r1_python_compile
- # Compilation only does anything for tests
- use test && cmake_src_compile
-}
-
-python_test() {
- cmake_build check
-}
-
-python_install() {
- distutils-r1_python_install
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/
@ 2023-07-17 1:18 Benda XU
0 siblings, 0 replies; 5+ messages in thread
From: Benda XU @ 2023-07-17 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 14d6583917451b5dfdad632d9d8956c56c8a7a18
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 00:05:13 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 01:17:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d65839
dev-python/pybind11: keyword ~x64-macos and ~arm64-macos.
A patch is need to undo the assumption of LLVM toolchain on macOS. It
does not affect other architectures, incorporating without a revision
bump.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
.../pybind11/files/pybind11-2.10.4_macOS-GCC.patch | 23 ++++++++++++++++++++++
dev-python/pybind11/pybind11-2.10.4.ebuild | 3 ++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
new file mode 100644
index 000000000000..5bfa88348110
--- /dev/null
+++ b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
@@ -0,0 +1,23 @@
+Break the toolchain assumption of LLVM on Prefix/macOS.
+
+At Prefix/macOS, the system compiler is GCC with libstdc++.
+
+This patch is only useful to Gentoo Prefix. We don't have plans to
+forward it upstream.
+
+Signed-off-by: Benda Xu <heroxbd@gentoo.org>
+
+Index: pybind11-2.10.4/pybind11/setup_helpers.py
+===================================================================
+--- pybind11-2.10.4.orig/pybind11/setup_helpers.py
++++ pybind11-2.10.4/pybind11/setup_helpers.py
+@@ -154,9 +154,6 @@ class Pybind11Extension(_Extension): #
+ c_cpp_flags = shlex.split(env_cflags) + shlex.split(env_cppflags)
+ if not any(opt.startswith("-g") for opt in c_cpp_flags):
+ cflags += ["-g0"]
+- if MACOS:
+- cflags += ["-stdlib=libc++"]
+- ldflags += ["-stdlib=libc++"]
+ self._add_cflags(cflags)
+ self._add_ldflags(ldflags)
+
diff --git a/dev-python/pybind11/pybind11-2.10.4.ebuild b/dev-python/pybind11/pybind11-2.10.4.ebuild
index ade4adbcd5e1..cea97d04299f 100644
--- a/dev-python/pybind11/pybind11-2.10.4.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
RDEPEND="
dev-cpp/eigen:3
@@ -38,6 +38,7 @@ distutils_enable_tests pytest
python_prepare_all() {
export PYBIND11_USE_CMAKE=1
cmake_src_prepare
+ PATCHES=( "${FILESDIR}"/pybind11-2.10.4_macOS-GCC.patch )
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/
@ 2024-07-08 14:26 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-07-08 14:26 UTC (permalink / raw
To: gentoo-commits
commit: 9fbc8ca585a3eeb87a1777ba7b4e4f98b2a4e9eb
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Mon Jul 8 12:21:11 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 14:26:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbc8ca5
dev-python/pybind11: add patch for gcc14
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37484
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../pybind11/files/pybind11-2.13.1-gcc14-fix.patch | 23 +++++++
dev-python/pybind11/pybind11-2.13.1-r1.ebuild | 76 ++++++++++++++++++++++
2 files changed, 99 insertions(+)
diff --git a/dev-python/pybind11/files/pybind11-2.13.1-gcc14-fix.patch b/dev-python/pybind11/files/pybind11-2.13.1-gcc14-fix.patch
new file mode 100644
index 000000000000..878ede4a14f6
--- /dev/null
+++ b/dev-python/pybind11/files/pybind11-2.13.1-gcc14-fix.patch
@@ -0,0 +1,23 @@
+Patch source: https://github.com/pybind/pybind11/commit/51c2aa16de5b50fe4be6a0016d6090d4a831899e
+From 51c2aa16de5b50fe4be6a0016d6090d4a831899e Mon Sep 17 00:00:00 2001
+From: wenqing <wenqing.wang@ufz.de>
+Date: Fri, 28 Jun 2024 16:12:32 +0200
+Subject: [PATCH] Fixed a compilation error with gcc 14 (#5208)
+
+---
+ include/pybind11/typing.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/pybind11/typing.h b/include/pybind11/typing.h
+index c8ba18d499..b0feb9464a 100644
+--- a/include/pybind11/typing.h
++++ b/include/pybind11/typing.h
+@@ -14,6 +14,8 @@
+ #include "cast.h"
+ #include "pytypes.h"
+
++#include <algorithm>
++
+ PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
+ PYBIND11_NAMESPACE_BEGIN(typing)
+
diff --git a/dev-python/pybind11/pybind11-2.13.1-r1.ebuild b/dev-python/pybind11/pybind11-2.13.1-r1.ebuild
new file mode 100644
index 000000000000..75b8a7930304
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.13.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="
+ https://pybind11.readthedocs.io/en/stable/
+ https://github.com/pybind/pybind11/
+ https://pypi.org/project/pybind11/
+"
+SRC_URI="
+ https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+ dev-cpp/eigen:3
+"
+BDEPEND="
+ test? (
+ <dev-cpp/catch-3:0
+ >=dev-cpp/catch-2.13.9:0
+ dev-libs/boost
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-gcc14-fix.patch" )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ cmake_src_prepare
+ distutils-r1_python_prepare_all
+}
+
+python_configure() {
+ local mycmakeargs=(
+ # disable forced lto
+ -DHAS_FLTO=OFF
+ # https://github.com/pybind/pybind11/issues/5087
+ -DPYBIND11_FINDPYTHON=OFF
+ -DPYBIND11_INSTALL=ON
+ -DPYBIND11_TEST=$(usex test)
+ )
+ cmake_src_configure
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ # Compilation only does anything for tests
+ use test && cmake_src_compile
+}
+
+python_test() {
+ cmake_build cpptest test_cmake_build
+
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ cd "${BUILD_DIR}/tests" || die
+ epytest "${S}/tests"
+}
+
+python_install() {
+ distutils-r1_python_install
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/
@ 2025-02-20 17:09 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2025-02-20 17:09 UTC (permalink / raw
To: gentoo-commits
commit: bb9fa113039738e8ae6c31f8882d45065b19c851
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 13:53:54 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 17:09:01 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9fa113
dev-python/pybind11: Enable pypy3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../pybind11/files/pybind11-2.13.6-pypy311.patch | 31 ++++++++++++++++++++++
dev-python/pybind11/pybind11-2.13.6.ebuild | 12 +++++++--
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/dev-python/pybind11/files/pybind11-2.13.6-pypy311.patch b/dev-python/pybind11/files/pybind11-2.13.6-pypy311.patch
new file mode 100644
index 000000000000..debc7b7c55e2
--- /dev/null
+++ b/dev-python/pybind11/files/pybind11-2.13.6-pypy311.patch
@@ -0,0 +1,31 @@
+diff --git a/include/pybind11/attr.h b/include/pybind11/attr.h
+index 1044db94..89d418cc 100644
+--- a/include/pybind11/attr.h
++++ b/include/pybind11/attr.h
+@@ -351,7 +351,8 @@ struct type_record {
+
+ bases.append((PyObject *) base_info->type);
+
+-#if PY_VERSION_HEX < 0x030B0000
++// Keep in sync with enable_dynamic_attributes() in detail/class.h
++#if PY_VERSION_HEX < 0x030B0000 || defined(PYPY_VERSION)
+ dynamic_attr |= base_info->type->tp_dictoffset != 0;
+ #else
+ dynamic_attr |= (base_info->type->tp_flags & Py_TPFLAGS_MANAGED_DICT) != 0;
+diff --git a/include/pybind11/detail/class.h b/include/pybind11/detail/class.h
+index b990507d..e97d48b2 100644
+--- a/include/pybind11/detail/class.h
++++ b/include/pybind11/detail/class.h
+@@ -560,9 +560,9 @@ extern "C" inline int pybind11_clear(PyObject *self) {
+ inline void enable_dynamic_attributes(PyHeapTypeObject *heap_type) {
+ auto *type = &heap_type->ht_type;
+ type->tp_flags |= Py_TPFLAGS_HAVE_GC;
+-#if PY_VERSION_HEX < 0x030B0000
+- type->tp_dictoffset = type->tp_basicsize; // place dict at the end
+- type->tp_basicsize += (ssize_t) sizeof(PyObject *); // and allocate enough space for it
++#if PY_VERSION_HEX < 0x030B0000 || defined(PYPY_VERSION) // For PyPy see PR #5508
++ type->tp_dictoffset = type->tp_basicsize; // place dict at the end
++ type->tp_basicsize += (ssize_t) sizeof(PyObject *); // and allocate enough space for it
+ #else
+ type->tp_flags |= Py_TPFLAGS_MANAGED_DICT;
+ #endif
diff --git a/dev-python/pybind11/pybind11-2.13.6.ebuild b/dev-python/pybind11/pybind11-2.13.6.ebuild
index 7f5daedfa762..dea8590f1058 100644
--- a/dev-python/pybind11/pybind11-2.13.6.ebuild
+++ b/dev-python/pybind11/pybind11-2.13.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
inherit cmake distutils-r1
@@ -39,7 +39,15 @@ EPYTEST_XDIST=1
distutils_enable_tests pytest
python_prepare_all() {
+ local PATCHES=(
+ # https://github.com/pybind/pybind11/pull/5508
+ # https://github.com/pybind/pybind11/pull/5537
+ "${FILESDIR}/${P}-pypy311.patch"
+ )
+
cmake_src_prepare
+
+ PATCHES=()
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-20 17:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-08 14:26 [gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-02-20 17:09 Michał Górny
2023-07-17 1:18 Benda XU
2022-05-05 7:09 Michał Górny
2022-02-17 19:03 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox