commit: 73df3377c229c492a95cf557ca6cb32d49b07085 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 2 07:07:52 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 2 07:09:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73df3377
dev-python/zstandard: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/zstandard/Manifest | 1 - .../zstandard/files/zstandard-0.22.0-build.patch | 53 -------------- dev-python/zstandard/zstandard-0.22.0-r1.ebuild | 80 ---------------------- dev-python/zstandard/zstandard-0.22.0.ebuild | 76 -------------------- 4 files changed, 210 deletions(-) diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest index b7eea7e0b7c9..0f80da98f1cc 100644 --- a/dev-python/zstandard/Manifest +++ b/dev-python/zstandard/Manifest @@ -1,2 +1 @@ -DIST python-zstandard-0.22.0.gh.tar.gz 707644 BLAKE2B ce400120f9106d729b50ae091a581f4a9fb2e796ec0872cb7db393aa7a55cf6e22cbff79c3ff780b4f609fbd8289a9744cbdfc730ba51cb09ee4e7c56b1dac9e SHA512 b3041217ad4b6297d0727dd5d22bc83645d43fa591985bef43e8633feb960310a3f2eb1edaa133595941a6932683af91d565266f312c987e6b6c514ce70c9ddb DIST python-zstandard-0.23.0.gh.tar.gz 732448 BLAKE2B 920b53dc4a221059411062229ddf0ff51c478c2212e5599dec21298fef8e30b7a160c2f7d958ef95251ce5fb1357eaf4a8c3e4eca37304ef7a43176f723f3394 SHA512 06d799f8c5e89e5cc2f5b8ff100aeb3c3ff938757ce39852affb075487f65406d7d3f6d611b1864ec025fff86a51bf15b80c8af6260beda050b4fef5b7edd206 diff --git a/dev-python/zstandard/files/zstandard-0.22.0-build.patch b/dev-python/zstandard/files/zstandard-0.22.0-build.patch deleted file mode 100644 index 1a5ff9affeda..000000000000 --- a/dev-python/zstandard/files/zstandard-0.22.0-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d7cb41b4ec0239c82d77a6cd7f55b4c7e3fe0c8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Wed, 1 Nov 2023 16:17:13 +0100 -Subject: [PATCH] build: fix building with modern setuptools backend - -Set correct `sys.path` prior to importing `setup_zstd`, in order to fix -building with the modern setuptools backend, i.e.: - -``` -* Getting build dependencies for wheel... -<string>:37: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead. -<string>:38: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead. -Traceback (most recent call last): - File "/usr/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 353, in <module> - main() - File "/usr/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 335, in main - json_out['return_val'] = hook(**hook_input['kwargs']) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "/usr/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 118, in get_requires_for_build_wheel - return hook(config_settings) - ^^^^^^^^^^^^^^^^^^^^^ - File "/tmp/build-env-mgz__6r4/lib/python3.12/site-packages/setuptools/build_meta.py", line 355, in get_requires_for_build_wheel - return self._get_build_requires(config_settings, requirements=['wheel']) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "/tmp/build-env-mgz__6r4/lib/python3.12/site-packages/setuptools/build_meta.py", line 325, in _get_build_requires - self.run_setup() - File "/tmp/build-env-mgz__6r4/lib/python3.12/site-packages/setuptools/build_meta.py", line 341, in run_setup - exec(code, locals()) - File "<string>", line 49, in <module> -ModuleNotFoundError: No module named 'setup_zstd' - -ERROR Backend subprocess exited when trying to invoke get_requires_for_build_wheel -``` ---- - setup.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/setup.py b/setup.py -index 7cc1f4f..2b2895b 100755 ---- a/setup.py -+++ b/setup.py -@@ -46,6 +46,8 @@ try: - except ImportError: - cffi = None - -+sys.path.insert(0, ".") -+ - import setup_zstd - - SUPPORT_LEGACY = False --- -2.42.0 - diff --git a/dev-python/zstandard/zstandard-0.22.0-r1.ebuild b/dev-python/zstandard/zstandard-0.22.0-r1.ebuild deleted file mode 100644 index e87c79a8840c..000000000000 --- a/dev-python/zstandard/zstandard-0.22.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 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..13} pypy3 ) - -inherit distutils-r1 - -MY_P=python-zstandard-${PV} -DESCRIPTION="Zstandard Bindings for Python" -HOMEPAGE=" - https://github.com/indygreg/python-zstandard/ - https://pypi.org/project/zstandard/ -" -SRC_URI=" - https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} - $(python_gen_cond_dep ' - >=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}] - ' 'python*') -" -BDEPEND=" - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${P}-build.patch" - ) - - # the C backend is repeatedly broken, so force CFFI instead - sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \ - -i zstandard/__init__.py || die - # unbundle zstd - rm zstd/* || die - > zstd/zstd.c || die - # it does random preprocessing on that, so we can't use #include - local f - for f in zdict.h zstd.h; do - cp "${ESYSROOT}/usr/include/${f}" "zstd/${f}" || die - done - sed -i -e '/include_dirs/a libraries=["zstd"],' make_cffi.py || die - - distutils-r1_src_prepare - - DISTUTILS_ARGS=( - --no-c-backend - ) -} - -python_test() { - local EPYTEST_DESELECT=( - # unreliable, fails on x86 - tests/test_data_structures.py::TestCompressionParameters::test_estimated_compression_context_size - # check for bundled zstd version, fails on other system zstd - tests/test_module_attributes.py::TestModuleAttributes::test_version - ) - - rm -rf zstandard || die - epytest -} diff --git a/dev-python/zstandard/zstandard-0.22.0.ebuild b/dev-python/zstandard/zstandard-0.22.0.ebuild deleted file mode 100644 index 4cdbd6d5636a..000000000000 --- a/dev-python/zstandard/zstandard-0.22.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 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..13} pypy3 ) - -inherit distutils-r1 - -MY_P=python-zstandard-${PV} -DESCRIPTION="Zstandard Bindings for Python" -HOMEPAGE=" - https://github.com/indygreg/python-zstandard/ - https://pypi.org/project/zstandard/ -" -SRC_URI=" - https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - app-arch/zstd:= -" -RDEPEND=" - ${DEPEND} - $(python_gen_cond_dep ' - >=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}] - ' 'python*') -" -BDEPEND=" - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${P}-build.patch" - ) - - # the C backend is repeatedly broken, so force CFFI instead - sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \ - -i zstandard/__init__.py || die - # unbundle zstd - : > zstd/zstdlib.c || die - # it does random preprocessing on that, so we can't use #include - cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die - sed -i -e '/include_dirs/a libraries=["zstd"],' make_cffi.py || die - - distutils-r1_src_prepare - - DISTUTILS_ARGS=( - --no-c-backend - ) -} - -python_test() { - local EPYTEST_DESELECT=( - # unreliable, fails on x86 - tests/test_data_structures.py::TestCompressionParameters::test_estimated_compression_context_size - # check for bundled zstd version, fails on other system zstd - tests/test_module_attributes.py::TestModuleAttributes::test_version - ) - - rm -rf zstandard || die - epytest -}
