diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-02-24 19:18:44 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-02-24 19:18:44 +0000 |
| commit | 00c7ba8be42a9862606bb46ea665113872f74013 (patch) | |
| tree | ee45c9dd0e71d67fae1a10f6ab0674e25724233f /dev-python | |
| parent | aab757986fb24809202fb731a8657c087f05328f (diff) | |
| download | baldeagleos-repo-00c7ba8be42a9862606bb46ea665113872f74013.tar.gz baldeagleos-repo-00c7ba8be42a9862606bb46ea665113872f74013.tar.xz baldeagleos-repo-00c7ba8be42a9862606bb46ea665113872f74013.zip | |
Adding metadata
Diffstat (limited to 'dev-python')
24 files changed, 282 insertions, 584 deletions
diff --git a/dev-python/boltons/boltons-25.0.0.ebuild b/dev-python/boltons/boltons-25.0.0.ebuild index 3b1416f2a490..0f9971212bd8 100644 --- a/dev-python/boltons/boltons-25.0.0.ebuild +++ b/dev-python/boltons/boltons-25.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://boltons.readthedocs.io/" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" distutils_enable_tests pytest diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest index 37a64204a00a..a11d7c268c91 100644 --- a/dev-python/langdetect/Manifest +++ b/dev-python/langdetect/Manifest @@ -1,3 +1 @@ DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db -EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6 -MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45 diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch new file mode 100644 index 000000000000..637368d2f237 --- /dev/null +++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch @@ -0,0 +1,13 @@ +Fix "Package 'langdetect.profiles' is absent from the `packages` configuration." + +--- a/setup.py ++++ b/setup.py +@@ -18,7 +18,7 @@ setup( + author_email='michal.danilak@gmail.com', + url='https://github.com/Mimino666/langdetect', + keywords='language detection library', +- packages=['langdetect', 'langdetect.utils', 'langdetect.tests'], ++ packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'], + include_package_data=True, + install_requires=['six'], + license='MIT', diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild index 56733bbffc48..eb2586280d80 100644 --- a/dev-python/langdetect/langdetect-1.0.9.ebuild +++ b/dev-python/langdetect/langdetect-1.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,4 +19,6 @@ KEYWORDS="~amd64" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" +PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" ) + distutils_enable_tests unittest diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml index 020e07f2a3dd..c0f74ac187e2 100644 --- a/dev-python/langdetect/metadata.xml +++ b/dev-python/langdetect/metadata.xml @@ -2,11 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>marcin.deranek@slonko.net</email> - <name>Marcin Deranek</name> + <email>pastalian46@gmail.com</email> + <name>Takuya Wakazono</name> </maintainer> - <upstream> - <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to> - </upstream> - <origin>slonko-overlay</origin> + + <origin>gentoo-guru-overlay</origin> </pkgmetadata>
\ No newline at end of file diff --git a/dev-python/qtpy/metadata.xml b/dev-python/qtpy/metadata.xml index dc02388378df..30c3ad5ef12f 100644 --- a/dev-python/qtpy/metadata.xml +++ b/dev-python/qtpy/metadata.xml @@ -16,7 +16,6 @@ </longdescription> <use> - <flag name="pyqt5">Use <pkg>dev-python/pyqt5</pkg> as Qt for Python implementation</flag> <flag name="pyqt6">Use <pkg>dev-python/pyqt6</pkg> as Qt for Python implementation</flag> <flag name="pyside6">Use <pkg>dev-python/pyside</pkg> as Qt for Python implementation</flag> <flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag> diff --git a/dev-python/qtpy/qtpy-2.4.2.ebuild b/dev-python/qtpy/qtpy-2.4.2.ebuild deleted file mode 100644 index 8742ecf981de..000000000000 --- a/dev-python/qtpy/qtpy-2.4.2.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_PN=QtPy -PYTHON_COMPAT=( python3_{9,10,11,12,13} ) - -inherit distutils-r1 virtualx pypi - -DESCRIPTION="Abstraction layer on top of PyQt and PySide with additional custom QWidgets" -HOMEPAGE=" - https://github.com/spyder-ide/qtpy/ - https://pypi.org/project/QtPy/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - -_IUSE_QT_MODULES=" - designer +gui help multimedia +network opengl positioning - printsupport qml quick sensors serialport speech +sql svg testlib - webchannel webengine websockets +widgets +xml -" -IUSE="+pyqt5 +pyqt6 pyside6 ${_IUSE_QT_MODULES}" -unset _IUSE_QT_MODULES - -REQUIRED_USE="|| ( pyqt5 pyqt6 pyside6 )" - -# These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds -# Disable them for now, please check periodically if this is still up to date. -# bluetooth? ( pyqt5/6 and pyside6 only ) -# dbus? ( pyqt5/6 and pyside6 only ) -# -# 3d? ( pyside2/6 only ) -# charts? ( pyside2 only ) -# concurrent? ( pyside2 only ) -# datavis? ( pyside2 only ) -# scxml? ( pyside2/6 only ) -# -# x11extras? ( pyside2 and pyqt5 only ) -# xmlpatterns? ( pyside2 and pyqt5 only ) -# -# location? ( pyside2/6 and pyqt5 only) -# nfc? ( pyqt6 and pyside6 only) -# spatialaudio? ( pyqt6 and pyside6 only) -# pdfium? ( pyqt6 and pyside6 only) - -# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going -# to work. The package only checks whether PyQt5/pyside2 is installed, it does -# not verify whether they have the necessary modules (i.e. satisfy the USE dep). -# -# Webengine is a special case, because PyQt5 provides this in a separate package -# while PySide2 ships it in the same package. -# -# declarative/qml/quick is a special case, because PyQt5 bundles the bindings -# for qml and quick in one flag: declarative PySide2 does not. -# -# The PyQt5 ebuild currently enables xml support unconditionally, the flag is -# added anyway with a (+) to make it future proof if the ebuild were to change -# this behaviour in the future. -# -# The PySide2 ebuild currently enables opengl and serialport support -# unconditionally, the flag is added anyway with a (+) to make it future proof -# if the ebuild were to change this behaviour in the future. -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - pyqt5? ( - dev-python/pyqt5[${PYTHON_USEDEP}] - dev-python/pyqt5[designer?,gui?,help?,multimedia?,network?,opengl?] - dev-python/pyqt5[positioning(-)?,printsupport?,sensors(-)?,serialport?,speech?,sql?,svg?] - dev-python/pyqt5[testlib?,webchannel?,websockets?,widgets?,xml(+)?] - qml? ( dev-python/pyqt5[declarative] ) - quick? ( dev-python/pyqt5[declarative] ) - webengine? ( dev-python/pyqtwebengine[${PYTHON_USEDEP}] ) - ) - pyqt6? ( - dev-python/pyqt6[${PYTHON_USEDEP}] - dev-python/pyqt6[designer?,gui?,help?,multimedia?,network?,opengl?] - dev-python/pyqt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?] - dev-python/pyqt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?] - webengine? ( dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets?,quick?] ) - - ) - pyside6? ( - dev-python/pyside[${PYTHON_USEDEP},core(+)] - dev-python/pyside[designer?,gui?,help?,multimedia?,network?,opengl?] - dev-python/pyside[positioning?,printsupport?,qml?,quick?,sensors(-)?,serialport?] - dev-python/pyside[speech(-)?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?] - dev-python/pyside[widgets?,xml?] - ) -" - -# The QtPy testsuite skips tests for bindings that are not installed, so here we -# ensure that everything is available and all tests are run. Note that not -# all flags are available in PyQt5/PySide2, so some tests are still skipped. -BDEPEND=" - test? ( - dev-python/pytest-qt[${PYTHON_USEDEP}] - pyqt5? ( - dev-python/pyqt5[${PYTHON_USEDEP}] - dev-python/pyqt5[dbus,declarative,designer,gui,help] - dev-python/pyqt5[multimedia,network,opengl,printsupport] - dev-python/pyqt5[serialport,speech(-),sql,svg,testlib,webchannel] - dev-python/pyqt5[websockets,widgets,x11extras,xml(+),xmlpatterns] - dev-python/pyqtwebengine[${PYTHON_USEDEP}] - dev-qt/qtsql:5[sqlite] - ) - pyqt6? ( - dev-python/pyqt6[${PYTHON_USEDEP}] - dev-python/pyqt6[dbus,designer,gui,help,multimedia,network,nfc,opengl] - dev-python/pyqt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport] - dev-python/pyqt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel] - dev-python/pyqt6[websockets,widgets,xml] - dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets,quick] - dev-qt/qtbase:6[sqlite] - ) - pyside6? ( - dev-python/pyside[${PYTHON_USEDEP},core(+)] - dev-python/pyside[3d(-),bluetooth(-),concurrent,dbus,designer,gui,help] - dev-python/pyside[location(-),multimedia,network,nfc(-),opengl,positioning,pdfium(-)] - dev-python/pyside[printsupport,qml,quick,quick3d,scxml(-),sensors(-)] - dev-python/pyside[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel] - dev-python/pyside[webengine,websockets,widgets,xml] - dev-qt/qtbase:6[sqlite] - ) - ) -" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die - # Disable Qt for Python implementations that are not selected - if ! use pyqt5; then - sed \ - -e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \ - -e '/if "PyQt5" in sys.modules:/,/"pyqt5"/c\' \ - -i qtpy/__init__.py || die - - # We need to ensure the first option is an 'if' not 'elif' - sed -e 's/elif "PySide2" in sys.modules:/if "PySide2" in sys.modules:/g' -i qtpy/__init__.py || die - fi - sed \ - -e "s/from PySide2 import/raise ImportError #/" \ - -e "s/from PySide2.QtCore import/raise ImportError #/" \ - -e '/if "PySide2" in sys.modules:/,/"pyside2"/c\' \ - -i qtpy/__init__.py || die - - if ! use pyqt5; then - sed \ - -e 's/elif "PyQt6" in sys.modules:/if "PyQt6" in sys.modules:/g' \ - -i qtpy/__init__.py || die - fi - if ! use pyqt6; then - sed \ - -e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \ - -e '/if "PyQt6" in sys.modules:/,/"pyqt6"/c\' \ - -i qtpy/__init__.py || die - - if ! use pyqt5; then - sed \ - -e 's/elif "PySide6" in sys.modules:/if "PySide6" in sys.modules:/g' \ - -i qtpy/__init__.py || die - fi - fi - if ! use pyside6; then - sed \ - -e "s/from PySide6 import/raise ImportError #/" \ - -e "s/from PySide6.QtCore import/raise ImportError #/" \ - -e '/if "PySide6" in sys.modules:/,/"pyside6"/c\' \ - -i qtpy/__init__.py || die - fi -} - -python_test() { - local -x QT_API - local -a EPYTEST_DESELECT - local other - - # Test for each enabled Qt4Python target. - # Deselect the other targets, their test fails if we specify QT_API - # or if we have disabled their corresponding inherit in __init__.py above - for QT_API in PyQt{5,6} PySide{2,6}; do - if use "${QT_API,,}"; then - EPYTEST_DESELECT=() - for other in PyQt{5,6} PySide{2,6}; do - if [[ ${QT_API} != ${other} ]]; then - EPYTEST_DESELECT+=( - "qtpy/tests/test_main.py::test_qt_api_environ[${other}]" - ) - fi - done - - einfo "Testing with ${EPYTHON} and QT_API=${QT_API}" - nonfatal epytest -o addopts= || - die -n "Tests failed with ${EPYTHON} and QT_API=${QT_API}" || - return 1 - fi - done -} - -src_test() { - virtx distutils-r1_src_test -} - -pkg_postinst() { - elog "When multiple Qt4Python targets are enabled QtPy will default to" - elog "the first enabled target in this order: PyQt5 PySide2 PyQt6 PySide6." - elog "This can be overridden with the QT_API environment variable." -} diff --git a/dev-python/scikit-image/scikit-image-0.25.0.ebuild b/dev-python/scikit-image/scikit-image-0.25.0.ebuild index d35686baebbc..ea4969ece699 100644 --- a/dev-python/scikit-image/scikit-image-0.25.0.ebuild +++ b/dev-python/scikit-image/scikit-image-0.25.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,9 +35,13 @@ RDEPEND=" >=dev-python/scipy-1.11.2[sparse(+),${PYTHON_USEDEP}] >=dev-python/tifffile-2022.8.12[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + dev-python/pythran[${PYTHON_USEDEP}] +" BDEPEND=" >=dev-python/cython-3.0.4[${PYTHON_USEDEP}] + dev-python/pythran[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] test? ( dev-python/pytest-localserver[${PYTHON_USEDEP}] diff --git a/dev-python/scikit-image/scikit-image-0.25.1.ebuild b/dev-python/scikit-image/scikit-image-0.25.1.ebuild index f48109fa6f66..f06f1a326401 100644 --- a/dev-python/scikit-image/scikit-image-0.25.1.ebuild +++ b/dev-python/scikit-image/scikit-image-0.25.1.ebuild @@ -35,10 +35,14 @@ RDEPEND=" >=dev-python/scipy-1.11.2[sparse(+),${PYTHON_USEDEP}] >=dev-python/tifffile-2022.8.12[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + dev-python/pythran[${PYTHON_USEDEP}] +" BDEPEND=" >=dev-python/cython-3.0.4[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pythran[${PYTHON_USEDEP}] test? ( dev-python/pytest-localserver[${PYTHON_USEDEP}] ) diff --git a/dev-python/scikit-image/scikit-image-0.25.2.ebuild b/dev-python/scikit-image/scikit-image-0.25.2.ebuild index 64116c63ac78..b2265b977540 100644 --- a/dev-python/scikit-image/scikit-image-0.25.2.ebuild +++ b/dev-python/scikit-image/scikit-image-0.25.2.ebuild @@ -35,10 +35,14 @@ RDEPEND=" >=dev-python/scipy-1.11.4[sparse(+),${PYTHON_USEDEP}] >=dev-python/tifffile-2022.8.12[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + dev-python/pythran[${PYTHON_USEDEP}] +" BDEPEND=" >=dev-python/cython-3.0.4[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pythran[${PYTHON_USEDEP}] test? ( dev-python/pytest-localserver[${PYTHON_USEDEP}] ) diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest index cbf55af536bd..2c6fff0f3c71 100644 --- a/dev-python/spyder-kernels/Manifest +++ b/dev-python/spyder-kernels/Manifest @@ -1,3 +1,2 @@ DIST spyder-kernels-3.0.1.gh.tar.gz 238107 BLAKE2B bf2b67555b561e935e13cc8bedfe178396f100252f3a0a2f8606971691c62d2bba64fc2cae443654aadd3a853674184eaaa3567855ce1c1358f5142f40c5ca74 SHA512 a16fe124f4abf36bc95f2e409391c550063f5fc00024c3b58b635eb03ca449678065daa25c27c42a4a85babd6fcbf80ab6423e519221c3916c8ddbb03c0056b3 DIST spyder-kernels-3.0.2.gh.tar.gz 239620 BLAKE2B d1661dccd5746afb377de4a6e78ebb169ad887df54b31afe1e290f2c34616a23b089b8c02ee5b0fac67dce3ab550f5908dd4d62cde8e2de1486a0553912c4410 SHA512 5bc64e8802a961dab124ae251f66c5987bf4125c57df6d25e209ce49bb49e63ea21dddcf75d524f93109205d48f3aec92a487b8b9faae3c1cdbd9cb9a206ad72 -DIST spyder_kernels-2.5.2.tar.gz 99972 BLAKE2B 178f175fe03fd2b7871681ae30d10b62a4daf9ee606477eab4f88a4d81d2692b80cdcf4f9b6d46c4cfc0394b98d798e93dda870a3f1cbe6f77e243fd2b06d97c SHA512 4cf5462d6a6e72bf13f9890fbc5a4008788e132ee3315b0ad01a00beff6b78c63f47b7b5d19be601b64984196cc1a5c4706a4c5bbe878d938e487ae9ddd9f1fc diff --git a/dev-python/spyder-kernels/spyder-kernels-2.5.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.5.2.ebuild deleted file mode 100644 index 25746a105824..000000000000 --- a/dev-python/spyder-kernels/spyder-kernels-2.5.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Kernels used by spyder on its ipython console" -HOMEPAGE=" - https://github.com/spyder-ide/spyder-kernels/ - https://pypi.org/project/spyder-kernels/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=" - dev-python/cloudpickle[${PYTHON_USEDEP}] - <dev-python/ipykernel-7[${PYTHON_USEDEP}] - >=dev-python/ipykernel-6.29.3[${PYTHON_USEDEP}] - <dev-python/ipython-9[${PYTHON_USEDEP}] - >=dev-python/ipython-8.13.0[${PYTHON_USEDEP}] - <dev-python/jupyter-client-9[${PYTHON_USEDEP}] - >=dev-python/jupyter-client-7.4.9[${PYTHON_USEDEP}] - dev-python/matplotlib-inline[${PYTHON_USEDEP}] - >=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}] - >=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}] -" - -BDEPEND=" - test? ( - dev-python/cython[${PYTHON_USEDEP}] - dev-python/django[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/xarray[${PYTHON_USEDEP}] - ' 'python*') - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # we no longer package distributed, and also removed dependency on dask - spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing -) - -python_test() { - if [[ ${EPYTHON} == pypy3 ]]; then - EPYTEST_IGNORE=( - # requires pandas - spyder_kernels/utils/tests/test_nsview.py - ) - EPYTEST_DESELECT+=( - # requires hdf5 - spyder_kernels/utils/tests/test_iofuncs.py::test_save_load_hdf5_files - spyder_kernels/utils/tests/test_dochelpers.py - ) - fi - distutils-r1_python_test -} diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest deleted file mode 100644 index c276ea380fef..000000000000 --- a/dev-python/spyder-terminal/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST spyder-terminal-1.2.2.tar.gz 9486091 BLAKE2B 0ac3178bddf82704bd1414999388248c83f9becaf96341a44a4117db88089730882acd08d4688b3ef8a09e52d06b5dc595edcd0fca07b3855fd9c82100af2f0e SHA512 7a4e7ca82553bf870650e0f3ce22f4ab93d54c539799ff855599e17452e4b0887854c30cadba1106b4feece021326709ec7c599e2953d0e72fae8e268db93cce diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml deleted file mode 100644 index 5e878b626286..000000000000 --- a/dev-python/spyder-terminal/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>nowa@gentoo.org</email> - <name>Nowa Ammerlaan</name> - </maintainer> - - <origin>gentoo-staging</origin> - <stabilize-allarches/> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2-r1.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2-r1.ebuild deleted file mode 100644 index cadc5c949413..000000000000 --- a/dev-python/spyder-terminal/spyder-terminal-1.2.2-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9,10,11,12,13} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi - -DESCRIPTION="Run system terminals inside Spyder" -HOMEPAGE="https://github.com/spyder-ide/spyder-terminal" - -LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/coloredlogs[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=dev-python/spyder-5.2.0[${PYTHON_USEDEP}] - <dev-python/spyder-6[${PYTHON_USEDEP}] - >=dev-python/terminado-0.13.1[${PYTHON_USEDEP}] - dev-python/tornado[${PYTHON_USEDEP}] -" diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest deleted file mode 100644 index 112da2f8b6c7..000000000000 --- a/dev-python/spyder-vim/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST spyder-vim-0.1.0.gh.tar.gz 867270 BLAKE2B 23f8d880bfbb168f4c6260cd19ac90aeef7413a825e4023d3e2f9fd6296f96f36792f553a98f458cb452d7f6a80f0b1bb7a31a4e4aa25bf3127cf3dafb600a85 SHA512 4671850782113e5c801ccb058bed036fb0675d817714929bcdf247f9819a25378925d20d4216cd9d6eba621be1c56b45631a9796c2b80f0a0b24cdc79c20d715 diff --git a/dev-python/spyder-vim/metadata.xml b/dev-python/spyder-vim/metadata.xml deleted file mode 100644 index 5e878b626286..000000000000 --- a/dev-python/spyder-vim/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>nowa@gentoo.org</email> - <name>Nowa Ammerlaan</name> - </maintainer> - - <origin>gentoo-staging</origin> - <stabilize-allarches/> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-python/spyder-vim/spyder-vim-0.1.0.ebuild b/dev-python/spyder-vim/spyder-vim-0.1.0.ebuild deleted file mode 100644 index a51f20e687dc..000000000000 --- a/dev-python/spyder-vim/spyder-vim-0.1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9,10,11,12,13} ) - -inherit distutils-r1 virtualx - -DESCRIPTION="Plugin for Spyder to enable Vim keybindings" -HOMEPAGE="https://github.com/spyder-ide/spyder-vim" -SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" - -RDEPEND=" - >=dev-python/spyder-5.3.3[${PYTHON_USEDEP}] - <dev-python/spyder-6[${PYTHON_USEDEP}] - " - -DEPEND="test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-qt[${PYTHON_USEDEP}] -)" - -DOCS=( "README.md" "RELEASE.md" "doc/example.gif" ) - -distutils_enable_tests pytest - -python_test() { - virtx epytest -} diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest index ce9fbd74cb8f..2321e235a2dd 100644 --- a/dev-python/spyder/Manifest +++ b/dev-python/spyder/Manifest @@ -1,6 +1,4 @@ -DIST spyder-5.5.6.gh.tar.gz 16304234 BLAKE2B 9d14b96901276ced1644eef8dd57539036aecb067ee361b6581368b371d56b2008350969224992a35fe10ee177babca7f3e941f43b4cc3f432f6d0dec9104ead SHA512 93ce6ac2e71bd4e81ca4a630a6fe152d1bf3c83d6e5c01dda8f3e5ad2735de1948a86642f5bc589c90616935e997526b26367ce178905ad2b80faf81f36f9164 DIST spyder-6.0.3.gh.tar.gz 15774411 BLAKE2B a9089c4d94e29cd38f2a80606ccd51daf443953f605dba22a1d7709b583add24d1a35b519a068e53b111bb96e04c27cb0a49b3d8f6fc88ac2f0e4667146361d0 SHA512 2f71667b54b8e8b85d862cb0e16d3657a2d1ce81bafa3170335866725c63e29e2349d8bff9a34422c9ff018677fd92f98d7f0ff22a064fe08e425492df216091 DIST spyder-6.0.4.gh.tar.gz 15800140 BLAKE2B 43447f622d528f6d8ea60e83d3ed868e2303c95df30b614900e48ecc34d472319b7786ac033fadc50c517488f8f0e4a657c926276e45710461f751817bb203d6 SHA512 d3718e8815f9f8d0e7b2e48c2ec5127a51b17a4549766376cfcaef68abb47f71ebba7c5823f8910583d171af9cde0e496ed2d7f947323ea54d2fcfff6fe8b34f -DIST spyder-docs-6951e02799fc7cd1f29456f1d93cfdcb570dad27.gh.tar.gz 93033557 BLAKE2B 395dd2a8ddb6e1b1408ba46cbe0fa452c1f2e69da1f3b6176401ff7395ace1463e63c696e13ee0b79f992b0ceca86228ad113f95ed7873db1b970452bc679f89 SHA512 c631e720e3ca49413482df294fb032285cf217ba94de299c37cb073e4e2bdeb629d16a139db17c569c74c628c50789c90d6085383886d32fa26b942711ccedc0 DIST spyder-docs-98004cb46d97fa9fa1cfc3f469919928761e7054.gh.tar.gz 93375891 BLAKE2B c98d391bb33b1ba70bf9c8e8072073e87437541aacd4be42140711b786e8ae07bf5a7ca53dffdb826922b5523150fa2950b04117c335dc57f7c2c22eb693c23f SHA512 55e13f9a55075aed007be32581af954d406703dd9586352084162e01865f943c5aff3aa11b50bdc9813dd8a3a52f8fa8f961c73cfc3f96d95930f2a7b823a1d1 DIST spyder-docs-fa91f0e9c8c2da33e7ec974e6b0e2a5ed6f04b10.gh.tar.gz 93358798 BLAKE2B 81f4d1d7b1244cb05df621e764c57e856952d9ec1b923a0d6529280651f8e15c586be0c7fe1dc65eed3792033cf0f1e5e8813d79706dbbfca0dcff29cb476831 SHA512 39d0a2d6ef45ebfd3e656916bad18adb7b4f3981e619dcb16fc6160b445cf80a264c4fd8d82f61a51a55774bf2f2a08ac0b1fb4201b2cce9046a0ddd1062daa5 diff --git a/dev-python/spyder/spyder-5.5.6-r1.ebuild b/dev-python/spyder/spyder-5.5.6-r1.ebuild deleted file mode 100644 index 964692281172..000000000000 --- a/dev-python/spyder/spyder-5.5.6-r1.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9,10,11,12,13} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 optfeature xdg #virtualx - -# Commit of documentation to fetch -DOCS_PV="6951e02799fc7cd1f29456f1d93cfdcb570dad27" - -DESCRIPTION="The Scientific Python Development Environment" -HOMEPAGE=" - https://www.spyder-ide.org/ - https://github.com/spyder-ide/spyder/ - https://pypi.org/project/spyder/ -" -SRC_URI=" - https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz - https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RDEPEND=" - >=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}] - >=dev-python/chardet-2.0.0[${PYTHON_USEDEP}] - >=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}] - >=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}] - >=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}] - >=dev-python/jellyfish-0.7[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/keyring-17.0.0[${PYTHON_USEDEP}] - >=dev-python/nbconvert-4.0[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}] - >=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}] - >=dev-python/pickleshare-0.4[${PYTHON_USEDEP}] - >=dev-python/psutil-5.3[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - >=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}] - >=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}] - <dev-python/python-lsp-black-3[${PYTHON_USEDEP}] - >=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}] - >=dev-python/pyxdg-0.26[${PYTHON_USEDEP}] - >=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}] - >=dev-python/qdarkstyle-3.2[${PYTHON_USEDEP}] - <dev-python/qdarkstyle-3.3[${PYTHON_USEDEP}] - >=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}] - >=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}] - <dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}] - >=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}] - <dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}] - >=dev-python/qtpy-2.1.0[${PYTHON_USEDEP},pyqt5(-),svg,webengine] - >=dev-python/rtree-0.9.7[${PYTHON_USEDEP}] - >=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}] - >=dev-python/spyder-kernels-2.5.2[${PYTHON_USEDEP}] - <dev-python/spyder-kernels-2.6.0[${PYTHON_USEDEP}] - >=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}] - >=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}] -" - -# BDEPEND=" -# test? ( -# dev-python/cython[${PYTHON_USEDEP}] -# dev-python/flaky[${PYTHON_USEDEP}] -# dev-python/matplotlib[tk,${PYTHON_USEDEP}] -# dev-python/pandas[${PYTHON_USEDEP}] -# dev-python/pillow[${PYTHON_USEDEP}] -# dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}] -# dev-python/pytest-mock[${PYTHON_USEDEP}] -# dev-python/pytest-order[${PYTHON_USEDEP}] -# dev-python/pytest-qt[${PYTHON_USEDEP}] -# dev-python/pytest-timeout[${PYTHON_USEDEP}] -# dev-python/pyyaml[${PYTHON_USEDEP}] -# dev-python/qtpy[${PYTHON_USEDEP},pyside2,pyqt5] -# dev-python/scipy[${PYTHON_USEDEP}] -# dev-python/sympy[${PYTHON_USEDEP}] -# )" - -# Based on the courtesy of Arfrever -# This patch removes a call to update-desktop-database during build -# This fails because access is denied to this command during build -PATCHES=( - "${FILESDIR}/${PN}-5.0.0-build.patch" -) - -DOCS=( - "AUTHORS.txt" - "Announcements.md" - "CHANGELOG.md" - "CODE_OF_CONDUCT.md" - "CONTRIBUTING.md" - "NOTICE.txt" - "README.md" - "RELEASE.md" -) - -# distutils_enable_tests pytest -# TODO: Package sphinx-design -# distutils_enable_sphinx docs/doc \ -# dev-python/sphinx-panels \ -# dev-python/pydata-sphinx-theme \ -# dev-python/sphinx-multiversion - -python_prepare_all() { - # move docs into workdir - mv ../spyder-docs-${DOCS_PV}* docs || die - - # these dependencies are packaged separately: - # dev-python/spyder-kernels, - # dev-python/python-lsp-server, - # dev-python/qdarkstyle - rm -r external-deps/* || die - # runs against things packaged in external-deps dir - rm conftest.py || die - - # Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5] - # Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine] - # Do not depend on parso and jedi, this is dependency is carried in python-lsp-server - # Do not depend on python-lsp-server, this dependency is carried in pyls-spyder - # Do not depend on ipython, this dependency is carried in spyder-kernels - # The explicit version requirements only make things more complicated, if e.g. - # pyls-spyder gains compatibility with a newer version of python-lsp-server - # in a new release it will take time for this information to propagate into - # the next spyder release. So just remove the dependency and let the other - # ebuilds handle the version requirements to speed things up and prevent - # issues such as Bug 803269. - sed -i \ - -e "/'pyqt5[ 0-9<=>.,]*',/d" \ - -e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \ - -e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \ - -e "/'parso[ 0-9<=>.,]*',/d" \ - -e "/'jedi[ 0-9<=>.,]*',/d" \ - -e "/'pylint[ 0-9<=>.,]*',/d" \ - setup.py || die - # -e "/'ipython[ 0-9<=>.,]*',/d" \ - - sed -i \ - -e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \ - -e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \ - -e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \ - -e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \ - -e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \ - spyder/dependencies.py || die - # -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \ - - # do not check deps, fails because we removed dependencies above - sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \ - spyder/tests/test_dependencies_in_sync.py || die - - # can't check for update, need network - rm spyder/workers/tests/test_update.py || die - - # skip online test - rm spyder/widgets/github/tests/test_github_backend.py || die - - distutils-r1_python_prepare_all -} - -# Calling pytest directly somehow passes the pytest arguments to spyder -# causing an invalid argument error -# python_test() { -# virtx "${EPYTHON}" runtests.py -# } - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib - optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas - optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy - optfeature "Symbolic mathematics in the IPython console" dev-python/sympy - optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy - optfeature "Run Cython files in the IPython console" dev-python/cython - optfeature "The hdf5/h5py plugin" dev-python/h5py - optfeature "The line profiler plugin" dev-python/spyder-line-profiler - optfeature "Vim key bindings" dev-python/spyder-vim - optfeature "Unittest support" dev-python/spyder-unittest - optfeature "System terminal inside spyder" dev-python/spyder-terminal - optfeature "Jupyter notebook support" dev-python/spyder-notebook - # spyder-memory-profiler is not compatible with spyder-5.2+ yet - # optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler - # spyder-reports not yet updated to >=spyder-4.0.0 - # optfeature "Markdown reports using Pweave" dev-python/spyder-reports - # Plugins with no release yet: - # optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager - # optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs -} diff --git a/dev-python/textual-dev/Manifest b/dev-python/textual-dev/Manifest index 43a26a84f2c5..e483b741e5de 100644 --- a/dev-python/textual-dev/Manifest +++ b/dev-python/textual-dev/Manifest @@ -1 +1 @@ -DIST textual-dev-1.7.1.gh.tar.gz 73273 BLAKE2B 6a9aac72418772d32ff034468d1b1a2e7153e9c6d177b58d09a9731a0ee366dcbb45f780f28535a7a60141531f66f765c72359e391c2648f405b1510af3088a3 SHA512 421076c1e512d65f0fcb02f7f2889ed5c81ebff5abe59488f6cfe236f9ea24b3203a6cb42b837718bd8d457f9bdb1afaed5d5a87f50b2f6bd5e23fe39a29a91d +DIST textual-dev-1.7.0.gh.tar.gz 73285 BLAKE2B 1798c09904063cb79ee965be02a5a801693e629376073ed14426ff5ba4712eea299e7fa42322c7eaadce47726d06c4bb9599060ad8a58dd94b55c95c76fd3381 SHA512 a3c2e14a3305620bfedc5a3d5f39844b107881ac2cbd39657f9e60f442e4dafbb8da5cb9d605e7033c1ad5e1766ae5a0c8de5c95127cc90ae4ded19dcc5cc2a3 diff --git a/dev-python/textual-dev/textual-dev-1.7.1.ebuild b/dev-python/textual-dev/textual-dev-1.7.0.ebuild index 8ccd5f90f578..8ccd5f90f578 100644 --- a/dev-python/textual-dev/textual-dev-1.7.1.ebuild +++ b/dev-python/textual-dev/textual-dev-1.7.0.ebuild diff --git a/dev-python/zstandard/files/zstandard-0.23.0-zstd-1.5.7.patch b/dev-python/zstandard/files/zstandard-0.23.0-zstd-1.5.7.patch new file mode 100644 index 000000000000..c9d1c1d8690d --- /dev/null +++ b/dev-python/zstandard/files/zstandard-0.23.0-zstd-1.5.7.patch @@ -0,0 +1,163 @@ +From 33c483f2df0be8de9df847c7cdfa9f9b32afc7aa Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" <bwiedemann@suse.de> +Date: Fri, 21 Feb 2025 20:59:18 +0100 +Subject: [PATCH 1/3] Use zstd-1.5.7 + +this changed compression results, so we have to adapt tests +--- + c-ext/backend_c.c | 2 +- + tests/test_compressor_compress.py | 2 +- + tests/test_compressor_compressobj.py | 2 +- + tests/test_compressor_copy_stream.py | 2 +- + tests/test_compressor_stream_writer.py | 2 +- + tests/test_module_attributes.py | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/c-ext/backend_c.c b/c-ext/backend_c.c +index aabe30b..4b09d1f 100644 +--- a/c-ext/backend_c.c ++++ b/c-ext/backend_c.c +@@ -152,7 +152,7 @@ void zstd_module_init(PyObject *m) { + PyObject *features = NULL; + PyObject *feature = NULL; + unsigned zstd_ver_no = ZSTD_versionNumber(); +- unsigned our_hardcoded_version = 10506; ++ unsigned our_hardcoded_version = 10507; + if (ZSTD_VERSION_NUMBER != our_hardcoded_version || + zstd_ver_no != our_hardcoded_version) { + PyErr_Format( +diff --git a/tests/test_compressor_compress.py b/tests/test_compressor_compress.py +index d96d476..c978c19 100644 +--- a/tests/test_compressor_compress.py ++++ b/tests/test_compressor_compress.py +@@ -52,7 +52,7 @@ class TestCompressor_compress(unittest.TestCase): + + cctx = zstd.ZstdCompressor(level=3, write_content_size=False) + result = cctx.compress(b"".join(chunks)) +- self.assertEqual(len(result), 999) ++ self.assertEqual(len(result), 1029) + self.assertEqual(result[0:4], b"\x28\xb5\x2f\xfd") + + # This matches the test for read_to_iter() below. +diff --git a/tests/test_compressor_compressobj.py b/tests/test_compressor_compressobj.py +index f429b32..b89ae20 100644 +--- a/tests/test_compressor_compressobj.py ++++ b/tests/test_compressor_compressobj.py +@@ -39,7 +39,7 @@ class TestCompressor_compressobj(unittest.TestCase): + cobj = cctx.compressobj() + + result = cobj.compress(b"".join(chunks)) + cobj.flush() +- self.assertEqual(len(result), 999) ++ self.assertEqual(len(result), 1029) + self.assertEqual(result[0:4], b"\x28\xb5\x2f\xfd") + + params = zstd.get_frame_parameters(result) +diff --git a/tests/test_compressor_copy_stream.py b/tests/test_compressor_copy_stream.py +index 82c7ce7..685660f 100644 +--- a/tests/test_compressor_copy_stream.py ++++ b/tests/test_compressor_copy_stream.py +@@ -50,7 +50,7 @@ class TestCompressor_copy_stream(unittest.TestCase): + r, w = cctx.copy_stream(source, dest) + + self.assertEqual(r, 255 * 16384) +- self.assertEqual(w, 999) ++ self.assertEqual(w, 1029) + + params = zstd.get_frame_parameters(dest.getvalue()) + self.assertEqual(params.content_size, zstd.CONTENTSIZE_UNKNOWN) +diff --git a/tests/test_compressor_stream_writer.py b/tests/test_compressor_stream_writer.py +index cfa198b..3baa788 100644 +--- a/tests/test_compressor_stream_writer.py ++++ b/tests/test_compressor_stream_writer.py +@@ -301,7 +301,7 @@ class TestCompressor_stream_writer(unittest.TestCase): + d = zstd.train_dictionary(8192, samples) + + h = hashlib.sha1(d.as_bytes()).hexdigest() +- self.assertEqual(h, "a46d2f7a3bc3357c9d717d3dadf9a26fde23e93d") ++ self.assertEqual(h, "f32ddfbe0878bbd428afc00b17810387c6752191") + + buffer = io.BytesIO() + cctx = zstd.ZstdCompressor(level=9, dict_data=d) +diff --git a/tests/test_module_attributes.py b/tests/test_module_attributes.py +index a99ed2e..3e3b482 100644 +--- a/tests/test_module_attributes.py ++++ b/tests/test_module_attributes.py +@@ -5,7 +5,7 @@ import zstandard as zstd + + class TestModuleAttributes(unittest.TestCase): + def test_version(self): +- self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 6)) ++ self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 7)) + + self.assertEqual(zstd.__version__, "0.23.0") + +From f598b951f36b6259fd7871892dd1e136f96c58ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Mon, 24 Feb 2025 11:30:29 +0100 +Subject: [PATCH 2/3] Update make_cffi.py to skip type alias macros in zstd + 1.5.7 + +--- + make_cffi.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/make_cffi.py b/make_cffi.py +index 170d1e5..763abb2 100644 +--- a/make_cffi.py ++++ b/make_cffi.py +@@ -179,7 +179,7 @@ ffi.set_source( + include_dirs=INCLUDE_DIRS, + ) + +-DEFINE = re.compile(b"^\\#define ([a-zA-Z0-9_]+) ") ++DEFINE = re.compile(rb"^#define\s+([a-zA-Z0-9_]+)\s+(\S+)") + + sources = [] + +@@ -204,9 +204,14 @@ for header in HEADERS: + if m.group(1) in (b"ZSTD_LIB_VERSION", b"ZSTD_VERSION_STRING"): + continue + ++ # These defines create aliases from old (camelCase) type names ++ # to the new PascalCase names, which breaks CFFI. ++ if m.group(1).lower() == m.group(2).lower(): ++ continue ++ + # The ... is magic syntax by the cdef parser to resolve the + # value at compile time. +- sources.append(m.group(0) + b" ...") ++ sources.append(b"#define " + m.group(1) + b" ...") + + cdeflines = b"\n".join(sources).splitlines() + cdeflines = [l for l in cdeflines if l.strip()] +From fb56d2b5ab38132bff998b15a0d3de4e91569167 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Mon, 24 Feb 2025 11:30:46 +0100 +Subject: [PATCH 3/3] Update backend_cffi for new type names in zstd 1.5.7 + +--- + zstandard/backend_cffi.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/zstandard/backend_cffi.py b/zstandard/backend_cffi.py +index 80d6fc8..38427f4 100644 +--- a/zstandard/backend_cffi.py ++++ b/zstandard/backend_cffi.py +@@ -2574,7 +2574,7 @@ def get_frame_parameters(data): + :return: + :py:class:`FrameParameters` + """ +- params = ffi.new("ZSTD_frameHeader *") ++ params = ffi.new("ZSTD_FrameHeader *") + + data_buffer = ffi.from_buffer(data) + zresult = lib.ZSTD_getFrameHeader(params, data_buffer, len(data_buffer)) +@@ -4289,7 +4289,7 @@ class ZstdDecompressor(object): + + # All chunks should be zstd frames and should have content size set. + chunk_buffer = ffi.from_buffer(chunk) +- params = ffi.new("ZSTD_frameHeader *") ++ params = ffi.new("ZSTD_FrameHeader *") + zresult = lib.ZSTD_getFrameHeader( + params, chunk_buffer, len(chunk_buffer) + ) diff --git a/dev-python/zstandard/zstandard-0.23.0-r2.ebuild b/dev-python/zstandard/zstandard-0.23.0-r2.ebuild new file mode 100644 index 000000000000..dd8b76cdccde --- /dev/null +++ b/dev-python/zstandard/zstandard-0.23.0-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2025 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_{9,10,11,12,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-1.5.7:= +" +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=( + # https://github.com/indygreg/python-zstandard/pull/255 + "${FILESDIR}/${P}-zstd-1.5.7.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 +} |
