* [gentoo-commits] repo/gentoo:master commit in: dev-python/kiwisolver/files/, dev-python/kiwisolver/
@ 2022-06-21 17:09 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-06-21 17:09 UTC (permalink / raw
To: gentoo-commits
commit: c6b82c6f9ba271ed07fcf6d98dbfed136a171f9a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 17:09:34 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 17:09:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b82c6f
dev-python/kiwisolver: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/kiwisolver/Manifest | 1 -
.../files/kiwisolver-1.4.2-python311.patch | 31 ----------------
dev-python/kiwisolver/kiwisolver-1.4.2.ebuild | 41 ----------------------
3 files changed, 73 deletions(-)
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index cf788ddcd3e5..df3d7c5b6935 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,2 +1 @@
-DIST kiwi-1.4.2.tar.gz 91150 BLAKE2B 8441d52267b3b436d9f05baabbd3beafc51d2f257fc982f1cf90b6296ccdbc24511de6b55b6201eb1df37ec9487282cc40142e9083cf4c1e925976a098927e1a SHA512 e7726ac7985bea1020fd3a26bf54b941acfffffb1f47b462c74f9829c5a89e7abd0732b5a11685b20d6a17ac9625178c68ea71052e852f91491a308d07111b01
DIST kiwi-1.4.3.gh.tar.gz 91238 BLAKE2B bdd6164eb428e6769ae7de2a8e689a3944e13e81aef9a839d9f68459deb7e7c0840b0eb59e70932e5c1d835444c515c8cb66fa47f40d8fc6244de47852be57d6 SHA512 04205555da46e772f2d25a481c4d966dc7bab8a541434a7c183e1b4f41ccd6e06aec564f2a95dae649585d337c1bf818a7cf24727460ad14669a3b3d74c74274
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.4.2-python311.patch b/dev-python/kiwisolver/files/kiwisolver-1.4.2-python311.patch
deleted file mode 100644
index a03af53a0280..000000000000
--- a/dev-python/kiwisolver/files/kiwisolver-1.4.2-python311.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/nucleic/kiwi/commit/f14059f532d6b5c6b505d9803b36a77b75546b18.patch
-https://bugs.gentoo.org/849563
-
-From f14059f532d6b5c6b505d9803b36a77b75546b18 Mon Sep 17 00:00:00 2001
-From: Matthieu Dartiailh <m.dartiailh@gmail.com>
-Date: Fri, 3 Jun 2022 09:11:18 +0200
-Subject: [PATCH] py: use nullptr instead of 0 in PyTuple_SET_ITEM
-
---- a/py/src/symbolics.h
-+++ b/py/src/symbolics.h
-@@ -123,7 +123,7 @@ PyObject* BinaryMul::operator()( Expression* first, double second )
- return 0;
- Py_ssize_t end = PyTuple_GET_SIZE( first->terms );
- for( Py_ssize_t i = 0; i < end; ++i ) // memset 0 for safe error return
-- PyTuple_SET_ITEM( terms.get(), i, 0 );
-+ PyTuple_SET_ITEM( terms.get(), i, nullptr );
- for( Py_ssize_t i = 0; i < end; ++i )
- {
- PyObject* item = PyTuple_GET_ITEM( first->terms, i );
---- a/py/src/util.h
-+++ b/py/src/util.h
-@@ -117,7 +117,7 @@ make_terms( const std::map<PyObject*, double>& coeffs )
- return 0;
- Py_ssize_t size = PyTuple_GET_SIZE( terms.get() );
- for( Py_ssize_t i = 0; i < size; ++i ) // zero tuple for safe early return
-- PyTuple_SET_ITEM( terms.get(), i, 0 );
-+ PyTuple_SET_ITEM( terms.get(), i, nullptr );
- Py_ssize_t i = 0;
- iter_t it = coeffs.begin();
- iter_t end = coeffs.end();
-
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
deleted file mode 100644
index e29fa7eee534..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=kiwi-${PV}
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi/"
-SRC_URI="
- https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-COMMON_DEPEND="
- >=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
-"
-BDEPEND="
- ${COMMON_DEPEND}
- >=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.2-python311.patch
-)
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/kiwisolver/files/, dev-python/kiwisolver/
@ 2023-02-19 19:46 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-02-19 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 0a8b9367a2cdcf49814e4d8c48efbe0196d56f2b
Author: Jérôme Carretero <cJ-gentoo <AT> zougloub <DOT> eu>
AuthorDate: Fri Feb 17 19:07:08 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 19:46:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8b9367
dev-python/kiwisolver: add pypy3 to PYTHON_COMPAT
Signed-off-by: Jérôme Carretero <cJ-gentoo <AT> zougloub.eu>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/kiwisolver-1.4.4-pypy3-tests.patch | 30 +++++++++++++++
dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild | 44 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
new file mode 100644
index 000000000000..705855f02f61
--- /dev/null
+++ b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
@@ -0,0 +1,30 @@
+Patch provided upstream as https://github.com/nucleic/kiwi/pull/158
+from issue created at https://github.com/nucleic/kiwi/issues/157
+
+commit ad1c62f046dc14c1e85e4e1c1b8e175eda08838e
+Author: Jérôme Carretero <cJ-kiwisolver@zougloub.eu>
+Date: Fri Feb 17 18:40:45 2023 -0500
+
+ py: tests: make tests run under PyPy
+
+diff --git a/py/tests/test_expression.py b/py/tests/test_expression.py
+index 671dd7f..6b5d8e5 100644
+--- a/py/tests/test_expression.py
++++ b/py/tests/test_expression.py
+@@ -8,6 +8,7 @@
+ import gc
+ import math
+ import operator
++import sys
+ from typing import Tuple
+
+ import pytest
+@@ -264,4 +265,7 @@ def test_expression_rich_compare_operations(op, symbol) -> None:
+ else:
+ with pytest.raises(TypeError) as excinfo:
+ op(e1, e2)
+- assert "kiwisolver.Expression" in excinfo.exconly()
++ if "PyPy" in sys.version:
++ assert "Expression" in excinfo.exconly()
++ else:
++ assert "kiwisolver.Expression" in excinfo.exconly()
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..67d18ec3f1e7
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="
+ https://github.com/nucleic/kiwi/
+ https://pypi.org/project/kiwisolver/
+"
+SRC_URI="
+ https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+ >=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+"
+BDEPEND="
+ ${COMMON_DEPEND}
+ >=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.4-pypy3-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/kiwisolver/files/, dev-python/kiwisolver/
@ 2023-12-07 17:24 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-12-07 17:24 UTC (permalink / raw
To: gentoo-commits
commit: aa2a27f8f81d5f077b547d35068fc961a70dedf0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 17:23:25 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 17:23:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2a27f8
dev-python/kiwisolver: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/kiwisolver/Manifest | 1 -
.../files/kiwisolver-1.4.4-pypy3-tests.patch | 30 ---------------
dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild | 45 ----------------------
3 files changed, 76 deletions(-)
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 8fc3163399dd..cead14b39286 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,2 +1 @@
-DIST kiwi-1.4.4.gh.tar.gz 91343 BLAKE2B a5e345509e7294eaf89e1361c035b3ef5d672d335682dbb426196d22876762b1f729cc728300f731a42afbfdf2828591f83cc53daf28e8d4c451a1b246b4800f SHA512 9a7ed487bb28f8c430543dc21ea59156078c129fd29b1382f1578368e72f312f4e813eb4501e4c9387647b42b085b93d4bd27d0e846f1396fa4ce68fd9e9ba5f
DIST kiwi-1.4.5.gh.tar.gz 91741 BLAKE2B cebdf8269b063d10f85a303cf5fa850f87c911aff9be37ae2b6762f021ea25b8b8cb3759e7e4292bc8c2fdbdf5d73ef6295263f541adb283969509cc11d8428a SHA512 889e106c27915cb773bc13969605812c1ca01a139e992d2b3517eb20989ae41392bfdcdd63184a7777b13eff5109d167869087ea09149b1527e56a3455213b14
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
deleted file mode 100644
index 705855f02f61..000000000000
--- a/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Patch provided upstream as https://github.com/nucleic/kiwi/pull/158
-from issue created at https://github.com/nucleic/kiwi/issues/157
-
-commit ad1c62f046dc14c1e85e4e1c1b8e175eda08838e
-Author: Jérôme Carretero <cJ-kiwisolver@zougloub.eu>
-Date: Fri Feb 17 18:40:45 2023 -0500
-
- py: tests: make tests run under PyPy
-
-diff --git a/py/tests/test_expression.py b/py/tests/test_expression.py
-index 671dd7f..6b5d8e5 100644
---- a/py/tests/test_expression.py
-+++ b/py/tests/test_expression.py
-@@ -8,6 +8,7 @@
- import gc
- import math
- import operator
-+import sys
- from typing import Tuple
-
- import pytest
-@@ -264,4 +265,7 @@ def test_expression_rich_compare_operations(op, symbol) -> None:
- else:
- with pytest.raises(TypeError) as excinfo:
- op(e1, e2)
-- assert "kiwisolver.Expression" in excinfo.exconly()
-+ if "PyPy" in sys.version:
-+ assert "Expression" in excinfo.exconly()
-+ else:
-+ assert "kiwisolver.Expression" in excinfo.exconly()
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
deleted file mode 100644
index 96b90cf0ac22..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=kiwi-${PV}
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="
- https://github.com/nucleic/kiwi/
- https://pypi.org/project/kiwisolver/
-"
-SRC_URI="
- https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-COMMON_DEPEND="
- >=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
-"
-BDEPEND="
- ${COMMON_DEPEND}
- >=dev-python/setuptools-scm-3.4.3[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.4-pypy3-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-07 17:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-19 19:46 [gentoo-commits] repo/gentoo:master commit in: dev-python/kiwisolver/files/, dev-python/kiwisolver/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-12-07 17:24 Michał Górny
2022-06-21 17:09 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