public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pysimdjson/files/, dev-python/pysimdjson/
@ 2021-07-24 17:33 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2021-07-24 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     eaf5eeeb1a75fb4d3b51e17edc9d039310da82e6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 24 17:33:07 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 24 17:33:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf5eeeb

dev-python/pysimdjson: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pysimdjson/Manifest                     |  1 -
 .../files/pysimdjson-4.0.0-error-types.patch       | 53 ----------------------
 dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild   | 43 ------------------
 3 files changed, 97 deletions(-)

diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 7e2fb4ca82d..3e21a4a19a6 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,2 +1 @@
-DIST pysimdjson-4.0.0.tar.gz 3738787 BLAKE2B 744d6bc53511e03e8e716d6c65771432c7bf8f7876bbf8c78d09459a8b170d3d396f9cc8996894f67110f4b7389526d454dffd687b1fda22df7f76f027af44db SHA512 8b3040ce44bb5042b70a14d9f67c312a375d1a12ba7a66466935a48ad0f8def9c21e200c8c93aa755110a674e95920fa7d0567c4f584be5392b70719994a2213
 DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5

diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
deleted file mode 100644
index 34b8f4aa9e2..00000000000
--- a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 1145be6cac70ed065f2053977d470f3f771ac6a0
-Author: Tyler Kennedy <tk@tkte.ch>
-Date:   Sun May 23 15:55:28 2021 -0400
-
-    Empty buffers now raise identical error to empty bytes. Closes #81.
-
-diff --git a/simdjson/csimdjson.pyx b/simdjson/csimdjson.pyx
-index 095a183..c278e08 100644
---- a/simdjson/csimdjson.pyx
-+++ b/simdjson/csimdjson.pyx
-@@ -478,6 +478,13 @@ cdef class Parser:
-             # type-specific APIs, but gives much greater compatibility.
-             data = src
- 
-+            if data.size == 0:
-+                # If we were given a completely empty buffer, trying to access
-+                # a stride in the next step will cause a (potentially
-+                # confusing) IndexError. This isn't a very good error message,
-+                # but it's identical to the one simdjson would have raised.
-+                raise ValueError('Empty: no JSON found')
-+
-             return element_to_primitive(
-                 self,
-                 dereference(self.c_parser).parse(
-diff --git a/tests/test_parser.py b/tests/test_parser.py
-index 88e7207..d3a28c7 100644
---- a/tests/test_parser.py
-+++ b/tests/test_parser.py
-@@ -1,3 +1,4 @@
-+import io
- import pathlib
- 
- import pytest
-@@ -32,6 +33,19 @@ def test_parse_str(parser):
-     assert doc.as_dict() == {'hello': 'world'}
- 
- 
-+def test_parse_empty_buffer(parser):
-+    """Ensure trying to parse an empty buffer returns an error consistent
-+    with attempting to parse an empty bytestring."""
-+    # Issue #81
-+    with pytest.raises(ValueError) as bytes_exc:
-+        parser.parse(b'')
-+
-+    with pytest.raises(ValueError) as buffer_exc:
-+        parser.parse(io.BytesIO(b'').getbuffer())
-+
-+    assert str(bytes_exc.value) == str(buffer_exc.value)
-+
-+
- def test_unicode_decode_error(parser):
-     """Ensure the parser raises encoding issues."""
-     with pytest.raises(UnicodeDecodeError):

diff --git a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
deleted file mode 100644
index e2b6c28fb20..00000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="https://github.com/TkTech/pysimdjson"
-SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-libs/simdjson:=
-"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
-	"${FILESDIR}"/pysimdjson-4.0.0-error-types.patch
-)
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# bundled lib :-(
-	rm simdjson/simdjson.{cpp,h} || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-	export BUILD_WITH_SYSTEM_LIB=1
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pysimdjson/files/, dev-python/pysimdjson/
@ 2023-04-27 22:01 Patrick McLean
  0 siblings, 0 replies; 4+ messages in thread
From: Patrick McLean @ 2023-04-27 22:01 UTC (permalink / raw
  To: gentoo-commits

commit:     950e8988458ce36893c85f1314faf11b8570f425
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 21:58:28 2023 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 22:01:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950e8988

dev-python/pysimdjson: Revbump, use system simdjson

This fixes a bug where the installed library is not importable on python 3.10

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/pysimdjson-5.0.2-system-lib.patch        | 72 ++++++++++++++++++++++
 .../pysimdjson/files/pysimdjson-5.0.2-tests.patch  | 13 ++++
 ...son-5.0.2.ebuild => pysimdjson-5.0.2-r1.ebuild} | 10 ++-
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/dev-python/pysimdjson/files/pysimdjson-5.0.2-system-lib.patch b/dev-python/pysimdjson/files/pysimdjson-5.0.2-system-lib.patch
new file mode 100644
index 000000000000..0a419e5dbc40
--- /dev/null
+++ b/dev-python/pysimdjson/files/pysimdjson-5.0.2-system-lib.patch
@@ -0,0 +1,72 @@
+diff --git a/setup.py b/setup.py
+index 865544d..24fdc36 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,5 +1,6 @@
+ import os.path
+ import platform
++import itertools
+ 
+ from setuptools import setup, find_packages, Extension
+ 
+@@ -17,11 +18,18 @@ with open(os.path.join(root, 'README.md'), 'rb') as readme:
+ 
+ system = platform.system()
+ 
++libraries = []
++extra_sources = []
+ extra_compile_args = []
+ 
+ if system == 'Darwin':
+     extra_compile_args.append('-std=c++11')
+ 
++if os.getenv('BUILD_WITH_SYSTEM_LIB'):
++    libraries.append('simdjson')
++else:
++    extra_sources.append('simdjson/simdjson.cpp')
++
+ if os.getenv('BUILD_WITH_CYTHON') and not CYTHON_AVAILABLE:
+     print(
+         'BUILD_WITH_CYTHON environment variable is set, but cython'
+@@ -49,12 +57,15 @@ if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
+     extensions = cythonize([
+         Extension(
+             'csimdjson',
+-            [
+-                'simdjson/simdjson.cpp',
+-                'simdjson/util.cpp',
+-                'simdjson/csimdjson.pyx'
+-            ],
++            list(itertools.chain(
++                [
++                    'simdjson/util.cpp',
++                    'simdjson/csimdjson.pyx'
++                ],
++                extra_sources
++            )),
+             define_macros=macros,
++            libraries=libraries,
+             extra_compile_args=extra_compile_args
+         )
+     ], compiler_directives=compiler_directives, force=force)
+@@ -62,12 +73,15 @@ else:
+     extensions = [
+         Extension(
+             'csimdjson',
+-            [
+-                'simdjson/simdjson.cpp',
+-                'simdjson/util.cpp',
+-                'simdjson/csimdjson.cpp'
+-            ],
++            list(itertools.chain(
++                [
++                    'simdjson/util.cpp',
++                    'simdjson/csimdjson.cpp'
++                ],
++                extra_sources
++            )),
+             extra_compile_args=extra_compile_args,
++            libraries=libraries,
+             language='c++'
+         )
+     ]

diff --git a/dev-python/pysimdjson/files/pysimdjson-5.0.2-tests.patch b/dev-python/pysimdjson/files/pysimdjson-5.0.2-tests.patch
new file mode 100644
index 000000000000..a70143b134f6
--- /dev/null
+++ b/dev-python/pysimdjson/files/pysimdjson-5.0.2-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/simdjson/csimdjson.pyx b/simdjson/csimdjson.pyx
+index 57c5f35..91182fc 100644
+--- a/simdjson/csimdjson.pyx
++++ b/simdjson/csimdjson.pyx
+@@ -480,7 +480,7 @@ cdef class Parser:
+                 # a stride in the next step will cause a (potentially
+                 # confusing) IndexError. This isn't a very good error message,
+                 # but it's identical to the one simdjson would have raised.
+-                raise ValueError('Empty: no JSON found')
++                raise ValueError('EMPTY: no JSON found')
+ 
+             return element_to_primitive(
+                 self,

diff --git a/dev-python/pysimdjson/pysimdjson-5.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild
similarity index 82%
rename from dev-python/pysimdjson/pysimdjson-5.0.2.ebuild
rename to dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild
index ab087fb2f157..2444355952a1 100644
--- a/dev-python/pysimdjson/pysimdjson-5.0.2.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-
+DISTUTILS_EXT=1
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for simdjson"
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	>=dev-libs/simdjson-2.0.1:=
+	test? ( dev-libs/simdjson[all-impls(-)] )
 "
 RDEPEND="
 	${DEPEND}
@@ -32,6 +33,11 @@ BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/pysimdjson-5.0.2-system-lib.patch"
+	"${FILESDIR}/pysimdjson-5.0.2-tests.patch"
+)
+
 distutils_enable_tests pytest
 
 src_prepare() {
@@ -45,7 +51,7 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 
-	export BUILD_WITH_CYTHON=1
+	export BUILD_WITH_CYTHON=1 BUILD_WITH_SYSTEM_LIB=1
 }
 
 python_compile() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pysimdjson/files/, dev-python/pysimdjson/
@ 2024-02-06 11:02 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-02-06 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     66047e8c963570a5883c069eab9d72b45e83cd84
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 11:00:18 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 11:02:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66047e8c

dev-python/pysimdjson: Bump to 6.0.2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pysimdjson/Manifest                     |  1 +
 .../files/pysimdjson-6.0.2-system-lib.patch        | 17 +++++++
 dev-python/pysimdjson/pysimdjson-6.0.2.ebuild      | 57 ++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 7e239b3da5ef..dd63631fc72f 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1 +1,2 @@
 DIST pysimdjson-5.0.2.gh.tar.gz 3828487 BLAKE2B 6197fa9adaa353df82def9f56f821e8b7f9ec955769e9ac28d990542fc0661f3afbe9cd8f7abfc55cdce8eac94c0e5fc78dba9102c7dcfc4e3c4307d0a6fc5bf SHA512 bd7ba4d6f95967f3cd086077406a2c65b895016c9baf16fa9be6dbf77d31487ad5c40e9e3dd2496070605ef37c6a1dc75f3c1b4c96ddc8465132fbcdbde77fd3
+DIST pysimdjson-6.0.2.gh.tar.gz 4493696 BLAKE2B 18f107fa5db762813e90dbf788d54ee24f823e177d2529f5311ef2b35320a45fd698ef6f8863c45ffad96c116ad5240eaf5a6724a3030578f89111cc40f24897 SHA512 ef8856dd137780a4345539b1604af34757b58a4b4d11854e420ad2e855f3e3f251b2ba6296c04d1bf2b71f095ca95fe95e9076e8740e98c7c4404a57df3617ba

diff --git a/dev-python/pysimdjson/files/pysimdjson-6.0.2-system-lib.patch b/dev-python/pysimdjson/files/pysimdjson-6.0.2-system-lib.patch
new file mode 100644
index 000000000000..8a58c6de0481
--- /dev/null
+++ b/dev-python/pysimdjson/files/pysimdjson-6.0.2-system-lib.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index fa1ff8b..3f36120 100644
+--- a/setup.py
++++ b/setup.py
+@@ -52,11 +52,11 @@ if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
+         Extension(
+             'csimdjson',
+             [
+-                'simdjson/simdjson.cpp',
+                 'simdjson/util.cpp',
+                 'simdjson/csimdjson.pyx'
+             ],
+             define_macros=macros,
++            libraries=["simdjson"],
+             extra_compile_args=extra_compile_args
+         )
+     ], compiler_directives=compiler_directives, force=force)

diff --git a/dev-python/pysimdjson/pysimdjson-6.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-6.0.2.ebuild
new file mode 100644
index 000000000000..96d0ec9517e1
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-6.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_EXT=1
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="
+	https://github.com/TkTech/pysimdjson/
+	https://pypi.org/project/pysimdjson/
+"
+SRC_URI="
+	https://github.com/TkTech/pysimdjson/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/simdjson-2.0.1:=
+	test? ( dev-libs/simdjson[all-impls(-)] )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/pysimdjson-6.0.2-system-lib.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# unbundle
+	rm simdjson/simdjson.cpp || die
+	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o required_plugins=
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pysimdjson/files/, dev-python/pysimdjson/
@ 2024-02-26 14:25 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-02-26 14:25 UTC (permalink / raw
  To: gentoo-commits

commit:     22867935949182cde4c73f92aa906950fdffd888
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 14:12:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 14:12:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22867935

dev-python/pysimdjson: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pysimdjson/Manifest                     |  1 -
 .../files/pysimdjson-5.0.2-system-lib.patch        | 72 ----------------------
 .../pysimdjson/files/pysimdjson-5.0.2-tests.patch  | 13 ----
 dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild   | 59 ------------------
 4 files changed, 145 deletions(-)

diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index dd63631fc72f..225533075c79 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,2 +1 @@
-DIST pysimdjson-5.0.2.gh.tar.gz 3828487 BLAKE2B 6197fa9adaa353df82def9f56f821e8b7f9ec955769e9ac28d990542fc0661f3afbe9cd8f7abfc55cdce8eac94c0e5fc78dba9102c7dcfc4e3c4307d0a6fc5bf SHA512 bd7ba4d6f95967f3cd086077406a2c65b895016c9baf16fa9be6dbf77d31487ad5c40e9e3dd2496070605ef37c6a1dc75f3c1b4c96ddc8465132fbcdbde77fd3
 DIST pysimdjson-6.0.2.gh.tar.gz 4493696 BLAKE2B 18f107fa5db762813e90dbf788d54ee24f823e177d2529f5311ef2b35320a45fd698ef6f8863c45ffad96c116ad5240eaf5a6724a3030578f89111cc40f24897 SHA512 ef8856dd137780a4345539b1604af34757b58a4b4d11854e420ad2e855f3e3f251b2ba6296c04d1bf2b71f095ca95fe95e9076e8740e98c7c4404a57df3617ba

diff --git a/dev-python/pysimdjson/files/pysimdjson-5.0.2-system-lib.patch b/dev-python/pysimdjson/files/pysimdjson-5.0.2-system-lib.patch
deleted file mode 100644
index 0a419e5dbc40..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-5.0.2-system-lib.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 865544d..24fdc36 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,5 +1,6 @@
- import os.path
- import platform
-+import itertools
- 
- from setuptools import setup, find_packages, Extension
- 
-@@ -17,11 +18,18 @@ with open(os.path.join(root, 'README.md'), 'rb') as readme:
- 
- system = platform.system()
- 
-+libraries = []
-+extra_sources = []
- extra_compile_args = []
- 
- if system == 'Darwin':
-     extra_compile_args.append('-std=c++11')
- 
-+if os.getenv('BUILD_WITH_SYSTEM_LIB'):
-+    libraries.append('simdjson')
-+else:
-+    extra_sources.append('simdjson/simdjson.cpp')
-+
- if os.getenv('BUILD_WITH_CYTHON') and not CYTHON_AVAILABLE:
-     print(
-         'BUILD_WITH_CYTHON environment variable is set, but cython'
-@@ -49,12 +57,15 @@ if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
-     extensions = cythonize([
-         Extension(
-             'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/util.cpp',
--                'simdjson/csimdjson.pyx'
--            ],
-+            list(itertools.chain(
-+                [
-+                    'simdjson/util.cpp',
-+                    'simdjson/csimdjson.pyx'
-+                ],
-+                extra_sources
-+            )),
-             define_macros=macros,
-+            libraries=libraries,
-             extra_compile_args=extra_compile_args
-         )
-     ], compiler_directives=compiler_directives, force=force)
-@@ -62,12 +73,15 @@ else:
-     extensions = [
-         Extension(
-             'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/util.cpp',
--                'simdjson/csimdjson.cpp'
--            ],
-+            list(itertools.chain(
-+                [
-+                    'simdjson/util.cpp',
-+                    'simdjson/csimdjson.cpp'
-+                ],
-+                extra_sources
-+            )),
-             extra_compile_args=extra_compile_args,
-+            libraries=libraries,
-             language='c++'
-         )
-     ]

diff --git a/dev-python/pysimdjson/files/pysimdjson-5.0.2-tests.patch b/dev-python/pysimdjson/files/pysimdjson-5.0.2-tests.patch
deleted file mode 100644
index a70143b134f6..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-5.0.2-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/simdjson/csimdjson.pyx b/simdjson/csimdjson.pyx
-index 57c5f35..91182fc 100644
---- a/simdjson/csimdjson.pyx
-+++ b/simdjson/csimdjson.pyx
-@@ -480,7 +480,7 @@ cdef class Parser:
-                 # a stride in the next step will cause a (potentially
-                 # confusing) IndexError. This isn't a very good error message,
-                 # but it's identical to the one simdjson would have raised.
--                raise ValueError('Empty: no JSON found')
-+                raise ValueError('EMPTY: no JSON found')
- 
-             return element_to_primitive(
-                 self,

diff --git a/dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild b/dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild
deleted file mode 100644
index 18c2cdbf0cf6..000000000000
--- a/dev-python/pysimdjson/pysimdjson-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_EXT=1
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="
-	https://github.com/TkTech/pysimdjson/
-	https://pypi.org/project/pysimdjson/
-"
-SRC_URI="
-	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=dev-libs/simdjson-2.0.1:=
-	test? ( dev-libs/simdjson[all-impls(-)] )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/pysimdjson-5.0.2-system-lib.patch"
-	"${FILESDIR}/pysimdjson-5.0.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# unbundle
-	> simdjson/simdjson.cpp || die
-	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1 BUILD_WITH_SYSTEM_LIB=1
-}
-
-python_compile() {
-	distutils-r1_python_compile --libraries simdjson
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-02-26 14:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-06 11:02 [gentoo-commits] repo/gentoo:master commit in: dev-python/pysimdjson/files/, dev-python/pysimdjson/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2024-02-26 14:25 Michał Górny
2023-04-27 22:01 Patrick McLean
2021-07-24 17:33 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