gentoo auto-resync : 15:07:2024 - 12:27:33

4 files changed, 2 insertions, 145 deletions

diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index a3edebcf8688..e36ab54aa02f 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,6 +1,3 @@
-AUX contourpy-1.2.0-unicore.patch 3169 BLAKE2B 436bd8b179be7bb695694de4254be53fc0915a1ce362966ec6c9c718da735155ac045ba8fd5c34b696b3700aa9e7646fa8ac65466172e8a466629151cbf06a27 SHA512 cbfc980b3bc300a36e4c11e7b59b06ec85a36930ae8a95e7f05e69747da4ee0425a5b684c1e22e0e40c534ff1e2dedee1f99d8e60af2e8d71a1daa68115132c2
-DIST contourpy-1.2.0.gh.tar.gz 13440145 BLAKE2B c8082f69c3c8ad2b9a2d7a8e68941f1b741b0527161df371b501a32b8f0572a012aa2184b9f3ea943f45143f218f910180e31371683826d2b9b9431537c72cbd SHA512 91084ca659f796fb49f34840fb08a1a8f2a78ce8264668f5729550b1c46f316933c1d76ed87797bf58a059f0cf63e6efc58c92e44c57787fc8ad1ca16a21aa6e
 DIST contourpy-1.2.1.gh.tar.gz 13440991 BLAKE2B 2e792ca990244f7890462b84a2f23e4fbc31fd8ce0a18bc8724767dfa4b5fc0a4271dc6989531423db58d567706a28ce95e680372dbf64bae93a09914353f3ac SHA512 2bb2ac7436cbee1ebc69e6edaf3166e294de32711cec506ce9a3132f1cf20ff8de70af27b432b81abb582c9fe30239f8724f68936908bdbf6348eb249eaae4d5
-EBUILD contourpy-1.2.0.ebuild 1188 BLAKE2B 3b3e2c3cd6c13776299b4b90ce456140d16ddfddb815fe7a3090e164d093c141fee828f00646e6f4ec9904ebc2f11bbd14c8c05fec72dfbd36e6366794f4ca56 SHA512 340e6bd22a5beac63e581ae372921ff58030a5cf43ec1915d2127f80a791ace4a450e8747d0fb25afbf41c84e414eb5ca03675f57e984ee700d78a456d3dc5ef
-EBUILD contourpy-1.2.1.ebuild 1094 BLAKE2B 9b6488ae5f47fd0c000f7e42b26f71fb5adfafe493c4f55b34a95d3acef45cb324a4b32fe0d045545baa87092368bd880c84e78b260f5572f05617d98aa4a169 SHA512 c541172d61ef221ec87a20b673220068f18d6afe5d02cc2f5e67e6e1a0d4e5058eb9cb3daf17df29255fecf74ae45bf227906f281665bde82079ead95f38a167
+EBUILD contourpy-1.2.1.ebuild 1093 BLAKE2B 418132262a654e0de12dbc9813a3e24d1183efb24199422a07b3264d0a7540abf4670e9b1df9794be57cf0b9cab7c468dbc4b2812cc6f3864c74591ef15531ef SHA512 a7abce7df1311e0a646fcb6770d081295e10625aed2f1d067edf65bcfa298625036438d1dbb6b51ed3751cb5facace20850443a3453275698c89319a036deae5
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.2.0.ebuild b/dev-python/contourpy/contourpy-1.2.0.ebuild
deleted file mode 100644
index c242301e976d..000000000000
--- a/dev-python/contourpy/contourpy-1.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for calculating contours in 2D quadrilateral grids"
-HOMEPAGE="
-	https://pypi.org/project/contourpy/
-	https://github.com/contourpy/contourpy/
-"
-SRC_URI="
-	https://github.com/contourpy/contourpy/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-python/numpy-1.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/wurlitzer[${PYTHON_USEDEP}]
-	)
-"
-
-DISTUTILS_ARGS=(
-	-Dwerror=false
-)
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/contourpy/contourpy/pull/327
-	"${FILESDIR}/${P}-unicore.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# linters
-		tests/test_codebase.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/contourpy/contourpy-1.2.1.ebuild b/dev-python/contourpy/contourpy-1.2.1.ebuild
index 2557c2f1f2ea..8c636d9c79a7 100644
--- a/dev-python/contourpy/contourpy-1.2.1.ebuild
+++ b/dev-python/contourpy/contourpy-1.2.1.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 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/contourpy/files/contourpy-1.2.0-unicore.patch b/dev-python/contourpy/files/contourpy-1.2.0-unicore.patch
deleted file mode 100644
index c25a1807dcd4..000000000000
--- a/dev-python/contourpy/files/contourpy-1.2.0-unicore.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From f948f821c705329a98bbcdcba5b642fe6c6f0b74 Mon Sep 17 00:00:00 2001
-From: matoro <matoro@users.noreply.github.com>
-Date: Wed, 15 Nov 2023 02:18:49 -0500
-Subject: [PATCH] Support running tests on unicore hosts
-
-All tests pass except those explicitly asserting that they are on a
-multicore system.  Adds a conditional skip to those which are only
-useful on multicore hosts.
----
- tests/test_filled.py | 7 +++++--
- tests/test_lines.py  | 7 +++++--
- tests/test_misc.py   | 8 +-------
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tests/test_filled.py b/tests/test_filled.py
-index b239f3b..c41e0d1 100644
---- a/tests/test_filled.py
-+++ b/tests/test_filled.py
-@@ -8,7 +8,7 @@
- from numpy.testing import assert_allclose, assert_array_equal
- import pytest
- 
--from contourpy import FillType, contour_generator
-+from contourpy import FillType, contour_generator, max_threads
- from contourpy.util.data import random, simple
- 
- from . import util_test
-@@ -734,7 +734,10 @@ def assert_chunk_offsets(offsets_or_none: list[cpy.OffsetArray | None]) -> None:
- @pytest.mark.threads
- @pytest.mark.parametrize("fill_type", FillType.__members__.values())
- @pytest.mark.parametrize("name, thread_count",
--                         [("serial", 1), ("threaded", 1), ("threaded", 2)])
-+                         [("serial", 1), ("threaded", 1),
-+                         pytest.param("threaded", 2,
-+                            marks = pytest.mark.skipif(
-+                            max_threads() <= 1, reason = "executing on unicore host"))])
- def test_return_by_fill_type_chunk(
-     xyz_chunk_test: tuple[cpy.CoordinateArray, ...],
-     name: str,
-diff --git a/tests/test_lines.py b/tests/test_lines.py
-index 9608591..0b0833b 100644
---- a/tests/test_lines.py
-+++ b/tests/test_lines.py
-@@ -6,7 +6,7 @@
- from numpy.testing import assert_allclose, assert_array_equal
- import pytest
- 
--from contourpy import LineType, contour_generator
-+from contourpy import LineType, contour_generator, max_threads
- from contourpy.util.data import random, simple
- 
- from . import util_test
-@@ -707,7 +707,10 @@ def test_return_by_line_type(
- @pytest.mark.threads
- @pytest.mark.parametrize("line_type", LineType.__members__.values())
- @pytest.mark.parametrize("name, thread_count",
--                         [("serial", 1), ("threaded", 1), ("threaded", 2)])
-+                         [("serial", 1), ("threaded", 1),
-+                         pytest.param("threaded", 2,
-+                            marks = pytest.mark.skipif(
-+                            max_threads() <= 1, reason = "executing on unicore host"))])
- def test_return_by_line_type_chunk(
-     xyz_chunk_test: tuple[cpy.CoordinateArray, ...],
-     name: str,
-diff --git a/tests/test_misc.py b/tests/test_misc.py
-index 5e46e3f..acd558a 100644
---- a/tests/test_misc.py
-+++ b/tests/test_misc.py
-@@ -2,13 +2,7 @@
- 
- import numpy as np
- 
--from contourpy import _remove_z_mask, contour_generator, max_threads
--
--
--def test_max_threads() -> None:
--    n = max_threads()
--    # Assume testing on machine with 2 or more cores.
--    assert n > 1
-+from contourpy import _remove_z_mask, contour_generator
- 
- 
- def test_nan() -> None: