From bb262580ec0b56a32797f121e627928d103e6bb1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Dec 2023 23:46:05 +0000 Subject: gentoo auto-resync : 30:12:2023 - 23:46:05 --- dev-python/cftime/Manifest | 3 -- dev-python/cftime/cftime-1.6.2-r1.ebuild | 43 ---------------------- .../cftime/files/cftime-1.6.2-cython-3.patch | 34 ----------------- 3 files changed, 80 deletions(-) delete mode 100644 dev-python/cftime/cftime-1.6.2-r1.ebuild delete mode 100644 dev-python/cftime/files/cftime-1.6.2-cython-3.patch (limited to 'dev-python/cftime') diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest index 0a64f682d059..c795c1abf264 100644 --- a/dev-python/cftime/Manifest +++ b/dev-python/cftime/Manifest @@ -1,6 +1,3 @@ -AUX cftime-1.6.2-cython-3.patch 1355 BLAKE2B 18574813e6a889e4161e4062bd3c6efba47526d90c9eb54b69083ea4fc37655cc2f84a7aeab914e5c3d706e0ecd9c16f3b0b48ffc691fff4860dcd01d5286c63 SHA512 6230c460abe67562de565e69eb138d3603c68f9ca848f2e180eaad691a0ee7df618218d40c3ccc35672f295eae0113cbbc9755aace960ce5b420b272534eca34 -DIST cftime-1.6.2.tar.gz 52745 BLAKE2B f3e91585b40a981e1c752ec3f086a4611354e228592a1b581b05f003d68878245a8ab4fae332d9054c2a9e85ef921b9110a0f8473861bd3e4cc92c287259ad44 SHA512 d5135a55e5c9982247835e379bd35e4d8b47f0f70d08766f73223e0c40dc1875840c5cb40515e233196af1c10e992911325ff33a3c41efc3b8009e49de2a6e31 DIST cftime-1.6.3.tar.gz 53256 BLAKE2B 8875c368e6811487960fb240ed5320ab1dcc24f3678e9663e67b7c49ab8cc1f12a0030670760fcd1a15938b57f3860d5c9c9b30a3e5a0e1755fcd0c7b8deaf5f SHA512 0bcb8dcf7a840e500d7cc0f784f960b4972803f353fcffbf36dc30b2169b6864aea1fd8cab2d60e7908a063db55f2cfa3639c51fea84692b2dfe2d83b954c0ae -EBUILD cftime-1.6.2-r1.ebuild 776 BLAKE2B 0663ad2af4dfa7ff07c8ddcc261114c5c84cf2f24ce538faf92fc8d30383eb133678af92f40a282b35b8ff042a26a55c9c9cd376e512c269331537eb907b4188 SHA512 06db37108b74d2f6598ee4ba061414258e31320c39a64dee38be7bd97bfb2327f7f7e70d6d4adecaa8cff1930c7861f7dc89b7bcf28d5d47f4494329da81ff0e EBUILD cftime-1.6.3.ebuild 726 BLAKE2B 18c91bde40938e82f5e97221fcd5dd9663d33a8dda1f5d7b875da86df8196eac3068e7ac618c448adff6afce3a4f04ef50026d404838bd528649b50507b6769b SHA512 8c844c4e74db4106edff6122d4a0cc2098464a678634df03ec1e9172cff6c454f46c6a7e80d3ec5bb0c7f701f2c72a03ee3586d10d8fa5e22039551775cf84d8 MISC metadata.xml 478 BLAKE2B 4999918d1667d93d5b8a38bc28b65255734bd11bcb9c56bcdd1920cfa7b3e1e9a5ce6751496e59dd914d1817bb3cf7fbb8a1c7a1a946c916f31dccb320c5a763 SHA512 af6b5275bb79ea316621108ce930d2a6aa3b7a42fa99b722573bcdae2c1488d3d2948c661dcf13cf50a35eb353ef125d47c387761ce1ea57cb6887349b5b0889 diff --git a/dev-python/cftime/cftime-1.6.2-r1.ebuild b/dev-python/cftime/cftime-1.6.2-r1.ebuild deleted file mode 100644 index c7709831ca42..000000000000 --- a/dev-python/cftime/cftime-1.6.2-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020-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} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Time-handling functionality from netcdf4-python" -HOMEPAGE=" - https://github.com/Unidata/cftime/ - https://pypi.org/project/cftime/ -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" - -DEPEND=" - >=dev-python/numpy-1.13.4[${PYTHON_USEDEP}] -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - >=dev-python/cython-0.29.20[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${P}-cython-3.patch" - ) - - # remove pytest-cov dep - sed -e "/--cov/d" -i setup.cfg || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/cftime/files/cftime-1.6.2-cython-3.patch b/dev-python/cftime/files/cftime-1.6.2-cython-3.patch deleted file mode 100644 index c52ebdb3c84f..000000000000 --- a/dev-python/cftime/files/cftime-1.6.2-cython-3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 31f782aed3de56300886dd7350f1faff657e14dd Mon Sep 17 00:00:00 2001 -From: Spencer Clark -Date: Sat, 29 Jul 2023 09:51:10 -0400 -Subject: [PATCH] Set c_api_binop_methods compiler directive to True - -This retains Cython 0.x behavior for arithmetic operators for -Cython >= 3.0.0. ---- - Changelog | 2 ++ - pyproject.toml | 2 +- - requirements-dev.txt | 2 +- - setup.py | 9 ++++++++- - 4 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 006f1a92..360396fa 100644 ---- a/setup.py -+++ b/setup.py -@@ -16,7 +16,14 @@ - BASEDIR = os.path.abspath(os.path.dirname(__file__)) - SRCDIR = os.path.join(BASEDIR,'src') - CMDS_NOCYTHONIZE = ['clean','clean_cython','sdist'] --COMPILER_DIRECTIVES = {} -+COMPILER_DIRECTIVES = { -+ # Cython 3.0.0 changes the default of the c_api_binop_methods directive to -+ # False, resulting in errors in datetime and timedelta arithmetic: -+ # https://github.com/Unidata/cftime/issues/271. We explicitly set it to -+ # True to retain Cython 0.x behavior for future Cython versions. This -+ # directive was added in Cython version 0.29.20. -+ "c_api_binop_methods": True -+} - DEFINE_MACROS = [("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")] - FLAG_COVERAGE = '--cython-coverage' # custom flag enabling Cython line tracing - NAME = 'cftime' -- cgit v1.2.3