From 9902490a074fb3ade57f89681db42d2ff7fdef51 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Tue, 4 Oct 2022 14:20:46 +0000 Subject: Adding metadata --- dev-python/PyQt6-WebEngine/Manifest | 1 + .../PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild | 63 +++++++ dev-python/PyQt6/Manifest | 1 + dev-python/PyQt6/PyQt6-6.4.0.ebuild | 149 +++++++++++++++ dev-python/QtPy/Manifest | 1 + dev-python/QtPy/QtPy-2.2.1.ebuild | 207 +++++++++++++++++++++ dev-python/contourpy/contourpy-1.0.5.ebuild | 2 +- dev-python/imageio/Manifest | 5 +- .../files/imageio-2.22.0-block-download.patch | 32 ++++ dev-python/imageio/imageio-2.21.0.ebuild | 52 ------ dev-python/imageio/imageio-2.21.1.ebuild | 52 ------ dev-python/imageio/imageio-2.21.2.ebuild | 52 ------ dev-python/imageio/imageio-2.22.0-r1.ebuild | 81 ++++++++ dev-python/imageio/imageio-2.22.0.ebuild | 52 ------ dev-python/itemadapter/Manifest | 1 + dev-python/itemadapter/itemadapter-0.7.0.ebuild | 27 +++ dev-python/itemloaders/Manifest | 1 + dev-python/itemloaders/itemloaders-1.0.6.ebuild | 25 +++ dev-python/libcst/libcst-0.4.3_p20220607.ebuild | 21 +-- dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild | 2 +- dev-python/prawcore/prawcore-2.3.0.ebuild | 3 +- dev-python/pydispatcher/Manifest | 1 + dev-python/pydispatcher/pydispatcher-2.0.6.ebuild | 19 ++ .../python-rtmidi-1.4.9-unbundle_rtmidi.patch | 21 +-- dev-python/qtconsole/Manifest | 1 - dev-python/qtconsole/qtconsole-5.3.1.ebuild | 59 ------ dev-python/scrapy/Manifest | 1 + dev-python/scrapy/scrapy-2.6.3.ebuild | 59 ++++++ 28 files changed, 694 insertions(+), 297 deletions(-) create mode 100644 dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild create mode 100644 dev-python/PyQt6/PyQt6-6.4.0.ebuild create mode 100644 dev-python/QtPy/QtPy-2.2.1.ebuild create mode 100644 dev-python/imageio/files/imageio-2.22.0-block-download.patch delete mode 100644 dev-python/imageio/imageio-2.21.0.ebuild delete mode 100644 dev-python/imageio/imageio-2.21.1.ebuild delete mode 100644 dev-python/imageio/imageio-2.21.2.ebuild create mode 100644 dev-python/imageio/imageio-2.22.0-r1.ebuild delete mode 100644 dev-python/imageio/imageio-2.22.0.ebuild create mode 100644 dev-python/itemadapter/itemadapter-0.7.0.ebuild create mode 100644 dev-python/itemloaders/itemloaders-1.0.6.ebuild create mode 100644 dev-python/pydispatcher/pydispatcher-2.0.6.ebuild delete mode 100644 dev-python/qtconsole/qtconsole-5.3.1.ebuild create mode 100644 dev-python/scrapy/scrapy-2.6.3.ebuild (limited to 'dev-python') diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest index 59d365d91651..4e2de2549f0d 100644 --- a/dev-python/PyQt6-WebEngine/Manifest +++ b/dev-python/PyQt6-WebEngine/Manifest @@ -1 +1,2 @@ DIST PyQt6_WebEngine-6.3.1.tar.gz 30607 BLAKE2B f07454684ce9c55ed8f477e7d7ba260af6d219b079e68d6752292310d1d8799b642acd3dad94b9259edfc9c41ee6249d2c1b69f57f7e5132dd71bc88e1e1d463 SHA512 61e30b6dbbd5d31dd03498b1d14279005bd00b59fe375f89b13cf318d5bdb6cbbf5449cd910303c9794ed14cbd25b0e63824ab952fc050d8c0451292c6f97be0 +DIST PyQt6_WebEngine-6.4.0.tar.gz 31180 BLAKE2B af7b10fa473bf0e5775319c47e8b8a7084321c09edc7a46ed89e771b8f0f44d5f4b59a47a9c902c3662296adbff4d514fa33c0b4071080b408c65167f64c77f8 SHA512 cbd549a91aa070aa81fdf60d836f8bdc1ec6b354868e1a0e39345f9072a8e60a019675e9983a1706ae0ac482a6f92c5beadb1ed4e4244b55f49df01d0e97e60c diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild new file mode 100644 index 000000000000..423b924b5d80 --- /dev/null +++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=sip +PYTHON_COMPAT=( python3_{7,8,9,10} ) +inherit distutils-r1 flag-o-matic multiprocessing qmake-utils + +QT_PV="6.3:6" # minimum tested qt version +MY_P="${P/-/_}" + +DESCRIPTION="Python bindings for QtWebEngine" +HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/" +SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug quick +widgets" + +RDEPEND=" + >=dev-python/PyQt6-${PV}[gui,ssl,${PYTHON_USEDEP}] + >=dev-qt/qtbase-${QT_PV} + >=dev-qt/qtwebengine-${QT_PV}[widgets] + quick? ( dev-python/PyQt6[qml] ) + widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] )" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}] + >=dev-qt/qtbase-${QT_PV} + sys-devel/gcc" + +src_prepare() { + default + + # hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112 + mkdir "${T}"/cxx || die + ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die + PATH=${T}/cxx:${PATH} +} + +src_configure() { + append-cxxflags -std=c++17 # for clang and old gcc that default to <17 + + # workaround until bug 863395 has something to offer + local qmake6=$(qt5_get_bindir)/qmake + qmake6=${qmake6//qt5/qt6} + + DISTUTILS_ARGS=( + --jobs=$(makeopts_jobs) + --qmake="${qmake6}" + --qmake-setting="$(qt5_get_qmake_args)" + --verbose + + --enable=QtWebEngineCore + $(usex quick --{enable,disable}=QtWebEngineQuick) + $(usex widgets --{enable,disable}=QtWebEngineWidgets) + + $(usev debug '--debug --qml-debug --tracing') + ) +} diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index 631567942685..fb24f9ce6d20 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1 +1,2 @@ DIST PyQt6-6.3.1.tar.gz 1015220 BLAKE2B e225f2da11eec482ab8e00f886a858cec4a2c8add764f5e54bf603959394aad7f12d91b92c1ba6ab98d1b25903d4404e6667232258a87c52c95a2abdae9ccd2d SHA512 94319cd0983eb3f9bb0f1acbc620a1631a37f82e2fcffb9d0e58437fb1c120640be1e2a0a09e98e03f6c7082a2d94e9eabceefa6b07bae354f77bda02ba92d58 +DIST PyQt6-6.4.0.tar.gz 1024037 BLAKE2B a55d2e33160b6bb713b5e32e6b3a3df942f373ce9c9697cad548325c35ee7ee73a57e93ebc8780480086b02d651fa848258f11f85bea0e54c61c8a0f99039c3d SHA512 836696cc708e140ff497fd915fac147265c58e5d44d54d7dcd1908bad54ed793b4c2c4f20b487d13c7a5f7eb6b2c47d7ab822d8ffc875657de7fd0f88ee6c53b diff --git a/dev-python/PyQt6/PyQt6-6.4.0.ebuild b/dev-python/PyQt6/PyQt6-6.4.0.ebuild new file mode 100644 index 000000000000..c2d2627be647 --- /dev/null +++ b/dev-python/PyQt6/PyQt6-6.4.0.ebuild @@ -0,0 +1,149 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=sip +PYTHON_COMPAT=( python3_{7,8,9,10} ) +inherit distutils-r1 flag-o-matic multiprocessing qmake-utils + +QT_PV="6.3:6" # minimum tested qt version + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/" +SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +# currently keeping defaults in sync with qtbase (no extra deps), but trying +# to stay minimal'ish given each builds relatively slowly (subject to change, +# perhaps more or less depending on consumers and if qtbase is ever split) +IUSE=" + +dbus debug qml designer examples gles2-only +gui help multimedia + +network opengl positioning printsupport quick quick3d serialport + +sql +ssl svg testlib webchannel websockets +widgets +xml" +# see `grep -r "%Import " sip` and `grep qmake_QT project.py` +REQUIRED_USE=" + designer? ( gui widgets ) + help? ( gui widgets ) + multimedia? ( gui network ) + opengl? ( gui ) + printsupport? ( gui widgets ) + qml? ( network ) + quick3d? ( gui qml ) + quick? ( gui qml ) + sql? ( widgets ) + svg? ( gui ) + testlib? ( gui widgets ) + webchannel? ( network ) + websockets? ( network ) + widgets? ( gui )" + +# note: xml(+) for now given qtbase-6.3.1-r0 is missing IUSE=xml with a TODO +DEPEND=" + >=dev-qt/qtbase-${QT_PV}[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml(+)?] + dbus? ( + dev-python/dbus-python[${PYTHON_USEDEP}] + sys-apps/dbus + ) + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) + help? ( >=dev-qt/qttools-${QT_PV}[assistant] ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) + positioning? ( >=dev-qt/qtpositioning-${QT_PV} ) + qml? ( >=dev-qt/qtdeclarative-${QT_PV} ) + quick3d? ( >=dev-qt/qtquick3d-${QT_PV} ) + serialport? ( >=dev-qt/qtserialport-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} ) + websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )" +RDEPEND=" + ${DEPEND} + >=dev-python/PyQt6-sip-13.4[${PYTHON_USEDEP}]" +BDEPEND=" + >=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}] + >=dev-qt/qtbase-${QT_PV} + sys-devel/gcc + dbus? ( virtual/pkgconfig )" + +src_prepare() { + default + + # hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112 + mkdir "${T}"/cxx || die + ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die + PATH=${T}/cxx:${PATH} +} + +src_configure() { + append-cxxflags -std=c++17 # for clang and old gcc that default to <17 + + pyqt-use_enable() { + local state=$(usex ${1} --enable= --disable=) + shift + echo ${*/#/${state}} + } + + # workaround until bug 863395 has something to offer + local qmake6=$(qt5_get_bindir)/qmake + qmake6=${qmake6//qt5/qt6} + + DISTUTILS_ARGS=( + --jobs=$(makeopts_jobs) + --qmake="${qmake6}" + --qmake-setting="$(qt5_get_qmake_args)" + --verbose + --confirm-license + + # TODO: enable/restrict more as qt6 packages/USE get added + --disable=QAxContainer + --disable=QtBluetooth + --enable=QtCore + $(pyqt-use_enable dbus QtDBus) + $(pyqt-use_enable designer QtDesigner) + $(pyqt-use_enable help QtHelp) + $(pyqt-use_enable gui QtGui) + #--disable=QtLocation # force-disabled in project.py + $(pyqt-use_enable multimedia QtMultimedia \ + $(usev widgets QtMultimediaWidgets)) + $(pyqt-use_enable network QtNetwork) + --disable=QtNfc + $(pyqt-use_enable opengl QtOpenGL \ + $(usev widgets QtOpenGLWidgets)) + --disable=QtPdf #+QtPdfWidgets (QtPdf is disabled in qtwebengine:6) + $(pyqt-use_enable positioning QtPositioning) + $(pyqt-use_enable printsupport QtPrintSupport) + $(pyqt-use_enable qml QtQml) + $(pyqt-use_enable quick QtQuick \ + $(usev widgets QtQuickWidgets)) + $(pyqt-use_enable quick3d QtQuick3D) + --disable=QtRemoteObjects + --disable=QtSensors + $(pyqt-use_enable serialport QtSerialPort) + $(pyqt-use_enable sql QtSql) + $(pyqt-use_enable svg QtSvg \ + $(usev widgets QtSvgWidgets)) + $(pyqt-use_enable testlib QtTest) + --disable=QtTextToSpeech + $(pyqt-use_enable webchannel QtWebChannel) + $(pyqt-use_enable websockets QtWebSockets) + $(pyqt-use_enable widgets QtWidgets) + $(pyqt-use_enable xml QtXml) + + $(usev debug '--debug --qml-debug --tracing') + + $(usev !dbus --no-dbus-python) + # TODO?: plugins not in wheels by upstream, see project.py#L215 + # (if needed by something, will need to be added to python_install) + $(usev !designer --no-designer-plugin) + $(usev !qml --no-qml-plugin) + + $(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2) + $(usev !ssl --disabled-feature=PyQt_SSL) + ) +} + +python_install_all() { + einstalldocs + use examples && dodoc -r examples +} diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest index 72d18e849036..cbe97f2b7ebe 100644 --- a/dev-python/QtPy/Manifest +++ b/dev-python/QtPy/Manifest @@ -1,2 +1,3 @@ DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff +DIST QtPy-2.2.1.tar.gz 52207 BLAKE2B c2fa3e7ab0bcb2fc5610bdbab57daa6e4bbbfa346f46fbba8dd9d5d9e592e4f7a2f54aa0cf7291222dca9c2db4b944abeff36513f044f86fce294b1d00261cae SHA512 9c0887880984aabcc2633ec7aa161726f295ff20c9c95db5bcd9121676e49017b8033412172b257ae29311a1d3fc42b9eb183cc48fe5d64c9a471211ec6fbc11 diff --git a/dev-python/QtPy/QtPy-2.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild new file mode 100644 index 000000000000..f4771f308bc6 --- /dev/null +++ b/dev-python/QtPy/QtPy-2.2.1.ebuild @@ -0,0 +1,207 @@ +# 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_{7,8,9,10} ) + +inherit distutils-r1 virtualx + +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/ +" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +_IUSE_QT_MODULES=" + designer +gui help multimedia +network opengl positioning + printsupport qml quick serialport +sql svg testlib + webchannel webengine websockets +widgets +xml +" +IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}" +unset _IUSE_QT_MODULES + +REQUIRED_USE="|| ( pyqt5 pyqt6 pyside2 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 only ) +# dbus? ( pyqt5 only ) +# +# 3d? ( pyside2 only ) +# charts? ( pyside2 only ) +# concurrent? ( pyside2 only ) +# datavis? ( pyside2 only ) +# scxml? ( pyside2 only ) +# script? ( pyside2 only ) +# scripttools? ( pyside2 only ) +# +# location? ( pyside2 and pyqt5 only ) +# sensors? ( pyside2 and pyqt5 only ) +# speech? ( pyside2 and pyqt5 only ) +# x11extras? ( pyside2 and pyqt5 only ) +# xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?] + dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?] + webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] ) + + ) + pyside2? ( + dev-python/pyside2[${PYTHON_USEDEP}] + dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?] + dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?] + dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?] + dev-python/pyside2[widgets?,xml?] + ) + pyside6? ( + dev-python/pyside6[${PYTHON_USEDEP}] + dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?] + dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?] + dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?] + dev-python/pyside6[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/mock[${PYTHON_USEDEP}] + pyqt5? ( + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location] + dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport] + dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel] + dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + ) + pyqt6? ( + dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,opengl] + dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport] + dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml] + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick] + ) + pyside2? ( + dev-python/pyside2[${PYTHON_USEDEP}] + dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help] + dev-python/pyside2[location,multimedia,network,opengl(+),positioning] + dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml] + dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib] + dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras] + dev-python/pyside2[xml,xmlpatterns] + ) + pyside6? ( + dev-python/pyside6[${PYTHON_USEDEP}] + dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia] + dev-python/pyside6[network,opengl,positioning,printsupport,qml] + dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib] + dev-python/pyside6[webchannel,webengine,websockets,widgets,xml] + ) + ) +" + +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 -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die + fi + if ! use pyqt6; then + sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die + fi + if ! use pyside2; then + sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die + fi + if ! use pyside6; then + sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py || die + fi +} + +python_test() { + # 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 + if use pyqt5; then + einfo "Testing with ${EPYTHON} and QT_API=PyQt5" + QT_API="pyqt5" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] + fi + if use pyqt6; then + einfo "Testing with ${EPYTHON} and QT_API=PyQt6" + QT_API="pyqt6" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \ + --deselect qtpy/tests/test_qtsensors.py::test_qtsensors + # Qt6Sensors not yet packaged and enabled in PyQt6 ebuild + fi + if use pyside2; then + einfo "Testing with ${EPYTHON} and QT_API=PySide2" + QT_API="pyside2" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] + fi + if use pyside6; then + einfo "Testing with ${EPYTHON} and QT_API=PySide6" + QT_API="pyside6" virtx epytest \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \ + --deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \ + --deselect qtpy/tests/test_qtsensors.py::test_qtsensors + # Qt6Sensors not yet packaged and enabled in PySide6 ebuild + fi +} + +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/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild index 4a34f9263f16..4f674cd992d6 100644 --- a/dev-python/contourpy/contourpy-1.0.5.ebuild +++ b/dev-python/contourpy/contourpy-1.0.5.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~riscv" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv" RDEPEND=" >=dev-python/numpy-1.16[${PYTHON_USEDEP}] diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest index 3251bc1377d8..ae59f0904f03 100644 --- a/dev-python/imageio/Manifest +++ b/dev-python/imageio/Manifest @@ -1,4 +1,3 @@ -DIST imageio-2.21.0.gh.tar.gz 391056 BLAKE2B 90fbacf7b396ab2b422d8694274ddc3642c92cfd325bce2861100f5bd28d82120cef6819b53b8ed82ba474d5e287765b63da9a7edfbfab5a026790a39d4edc1e SHA512 5bb070da560ba3a2e10bdb288ad539274ee14f8cf0543847859f0bae052b3d1782777d823435b74120bcfdff0b6cb15a6c80b2a9bf729439bbb3802f15cf5684 -DIST imageio-2.21.1.gh.tar.gz 391159 BLAKE2B 4c569ec81255d1f5985d2d30f303a978f9cb22e0d7368845648ddab9e5734adba52173d42ad73c94c424ce1a5806c3a10ae31381b04949f7f8c30fd327b585b4 SHA512 61fd4a1a64fb152fa5c419cac9a69ea979ac762fbaed81076ddd13602db98f71f31825615111958f21b021213d55be060197417159022bba84d631618f5bb286 -DIST imageio-2.21.2.gh.tar.gz 392425 BLAKE2B 959c89627188aca0072f519f0f9c3a9fcf2da96883f95760375bea503efd96ff6a198ad7e8bc12dfffe6aecf42f4b07176c8d273c6d349b5e2581053ddefecb6 SHA512 69922f05457f050083e92dbce34992911d5fb04f283d6784a8e1fd7f10e7887ffeef343d8f4162efaa55690f363ed6ceb5d2cdc5ee712ae9b276f072fdc45d37 DIST imageio-2.22.0.gh.tar.gz 394144 BLAKE2B 957edbeaad6be459ff865eed3159b0f7776e3dd0782e0380bfe2c40362d0c08ccc8f29a2f38a8427deb263554495b73cc4df641e569b9d33700fcc6ed1395396 SHA512 23d606e32ab2bdc306a4b9d17120e5eda8c8a4fd96d840181afecd6e35f6649621740608f0286d2a5462822acc7ef4e1e7f1e9076882ce975f1da717b136c8c4 +DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27 +DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49 diff --git a/dev-python/imageio/files/imageio-2.22.0-block-download.patch b/dev-python/imageio/files/imageio-2.22.0-block-download.patch new file mode 100644 index 000000000000..ba483813b23c --- /dev/null +++ b/dev-python/imageio/files/imageio-2.22.0-block-download.patch @@ -0,0 +1,32 @@ +From 1ae48cfa95e84cb064edc74a4a64bd0f7dee780a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Tue, 4 Oct 2022 09:40:42 +0200 +Subject: [PATCH] Unconditionally disable downloading binaries from Internet + +Bug: https://bugs.gentoo.org/874849 +--- + imageio/core/fetching.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/imageio/core/fetching.py b/imageio/core/fetching.py +index 0380bc7..70f1a3d 100644 +--- a/imageio/core/fetching.py ++++ b/imageio/core/fetching.py +@@ -97,11 +97,10 @@ def get_remote_file(fname, directory=None, force_download=False, auto=True): + break + + # If we get here, we're going to try to download the file +- if os.getenv("IMAGEIO_NO_INTERNET", "").lower() in ("1", "true", "yes"): ++ if True: + raise InternetNotAllowedError( +- "Will not download resource from the " +- "internet because environment variable " +- "IMAGEIO_NO_INTERNET is set." ++ "Implicit insecure downloads disabled on Gentoo due to security " ++ "concerns. See https://bugs.gentoo.org/874849." + ) + + # Can we proceed with auto-download? +-- +2.38.0 + diff --git a/dev-python/imageio/imageio-2.21.0.ebuild b/dev-python/imageio/imageio-2.21.0.ebuild deleted file mode 100644 index 65cad728e477..000000000000 --- a/dev-python/imageio/imageio-2.21.0.ebuild +++ /dev/null @@ -1,52 +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_{7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Python library for reading and writing image data" -HOMEPAGE=" - https://imageio.readthedocs.io/en/stable/ - https://github.com/imageio/imageio/ - https://pypi.org/project/imageio/ -" -SRC_URI=" - https://github.com/imageio/imageio/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# over 50% of tests rely on Internet -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}] - media-libs/freeimage -" -# requests for fsspec[github] -BDEPEND=" - test? ( - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/imageio-ffmpeg[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tifffile[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # Fails because of system installed freeimage - tests/test_core.py::test_findlib2 - # Tries to download ffmpeg binary ?! - tests/test_ffmpeg.py::test_get_exe_installed -) diff --git a/dev-python/imageio/imageio-2.21.1.ebuild b/dev-python/imageio/imageio-2.21.1.ebuild deleted file mode 100644 index 65cad728e477..000000000000 --- a/dev-python/imageio/imageio-2.21.1.ebuild +++ /dev/null @@ -1,52 +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_{7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Python library for reading and writing image data" -HOMEPAGE=" - https://imageio.readthedocs.io/en/stable/ - https://github.com/imageio/imageio/ - https://pypi.org/project/imageio/ -" -SRC_URI=" - https://github.com/imageio/imageio/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# over 50% of tests rely on Internet -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}] - media-libs/freeimage -" -# requests for fsspec[github] -BDEPEND=" - test? ( - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/imageio-ffmpeg[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tifffile[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # Fails because of system installed freeimage - tests/test_core.py::test_findlib2 - # Tries to download ffmpeg binary ?! - tests/test_ffmpeg.py::test_get_exe_installed -) diff --git a/dev-python/imageio/imageio-2.21.2.ebuild b/dev-python/imageio/imageio-2.21.2.ebuild deleted file mode 100644 index 65cad728e477..000000000000 --- a/dev-python/imageio/imageio-2.21.2.ebuild +++ /dev/null @@ -1,52 +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_{7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Python library for reading and writing image data" -HOMEPAGE=" - https://imageio.readthedocs.io/en/stable/ - https://github.com/imageio/imageio/ - https://pypi.org/project/imageio/ -" -SRC_URI=" - https://github.com/imageio/imageio/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# over 50% of tests rely on Internet -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}] - media-libs/freeimage -" -# requests for fsspec[github] -BDEPEND=" - test? ( - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/imageio-ffmpeg[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tifffile[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # Fails because of system installed freeimage - tests/test_core.py::test_findlib2 - # Tries to download ffmpeg binary ?! - tests/test_ffmpeg.py::test_get_exe_installed -) diff --git a/dev-python/imageio/imageio-2.22.0-r1.ebuild b/dev-python/imageio/imageio-2.22.0-r1.ebuild new file mode 100644 index 000000000000..10601f5a0811 --- /dev/null +++ b/dev-python/imageio/imageio-2.22.0-r1.ebuild @@ -0,0 +1,81 @@ +# 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_{7,8,9,10} ) + +inherit distutils-r1 + +BIN_COMMIT=224074bca448815e421a59266864c23041531a42 +DESCRIPTION="Python library for reading and writing image data" +HOMEPAGE=" + https://imageio.readthedocs.io/en/stable/ + https://github.com/imageio/imageio/ + https://pypi.org/project/imageio/ +" +SRC_URI=" + https://github.com/imageio/imageio/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + test? ( + https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png + -> ${PN}-chelsea.png + https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4 + -> ${PN}-cockatoo.mp4 + ) +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# over 50% of tests rely on Internet +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND=" + >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}] + >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}] + media-libs/freeimage +" +# requests for fsspec[github] +BDEPEND=" + test? ( + dev-python/fsspec[${PYTHON_USEDEP}] + dev-python/imageio-ffmpeg[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tifffile[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + local PATCHES=( + # block silently downloading vulnerable libraries from the Internet + "${FILESDIR}"/imageio-2.22.0-block-download.patch + ) + + if use test; then + mkdir -p "${HOME}"/.imageio/images || die + local i + for i in chelsea.png cockatoo.mp4; do + cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die + done + fi + + distutils-r1_src_prepare +} + +EPYTEST_DESELECT=( + # Fails because of system installed freeimage + tests/test_core.py::test_findlib2 + # Tries to download ffmpeg binary ?! + tests/test_ffmpeg.py::test_get_exe_installed + # blocked by our patch + tests/test_core.py::test_fetching + tests/test_core.py::test_request + # removed upstream + tests/test_pillow.py::test_png_remote +) diff --git a/dev-python/imageio/imageio-2.22.0.ebuild b/dev-python/imageio/imageio-2.22.0.ebuild deleted file mode 100644 index 65cad728e477..000000000000 --- a/dev-python/imageio/imageio-2.22.0.ebuild +++ /dev/null @@ -1,52 +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_{7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Python library for reading and writing image data" -HOMEPAGE=" - https://imageio.readthedocs.io/en/stable/ - https://github.com/imageio/imageio/ - https://pypi.org/project/imageio/ -" -SRC_URI=" - https://github.com/imageio/imageio/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# over 50% of tests rely on Internet -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}] - media-libs/freeimage -" -# requests for fsspec[github] -BDEPEND=" - test? ( - dev-python/fsspec[${PYTHON_USEDEP}] - dev-python/imageio-ffmpeg[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tifffile[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # Fails because of system installed freeimage - tests/test_core.py::test_findlib2 - # Tries to download ffmpeg binary ?! - tests/test_ffmpeg.py::test_get_exe_installed -) diff --git a/dev-python/itemadapter/Manifest b/dev-python/itemadapter/Manifest index a734b0285fea..663ea5b49e4b 100644 --- a/dev-python/itemadapter/Manifest +++ b/dev-python/itemadapter/Manifest @@ -1,2 +1,3 @@ DIST itemadapter-0.4.0.tar.gz 14682 BLAKE2B ce7c9bcebd1dd75c35e76af2a788e6b3695c4e2fa19cc7dc467dc8dcd58deb71ae2f9272195d5030c0a72b80f56171ed9760eefd6c5c2b2769176ca8b441d6b8 SHA512 c7226c2e0e8c2f1695ec62e67a60b99ed92f4e71c9003a274292df91cef54abc382f614eb08422be6d532c0e91fa0bf962d2b5f6b2220e107b5ba43d921be15d DIST itemadapter-0.6.0.tar.gz 16325 BLAKE2B 75fa4c520de2c8fef8bf84ca416c2603d3237d86a994d4c083d6ad3469b03d8398ecd5828a3a3d18f742462002294c1872a493f4b29983907eaadb2b8af8f1fa SHA512 faa6170ea72d29f15c0332f38b288d8a4f1e2bb7229d3eb61227b52231c4d16d52bed09eda52acaf8653093afbc59ba2ec9ef8a2a4d408502f70704cea82c9ec +DIST itemadapter-0.7.0.tar.gz 16849 BLAKE2B 1efd7251c50f17e8e3e52d3544b24ccdc5e5fcae90ad46f010959e3d5e6b2703271e310a37762b087a873a1ae0c0c9249ca19229cd062d974a05119d2e7ec221 SHA512 7402650f82fa16c2976821c5033a156c0994ad059581a714cb9a920235b1d2d4bbba60fbb186374377fb5dfc16ec59c5d432987e5c7906655c4e20d27f5e65cd diff --git a/dev-python/itemadapter/itemadapter-0.7.0.ebuild b/dev-python/itemadapter/itemadapter-0.7.0.ebuild new file mode 100644 index 000000000000..5c63a03f3ae4 --- /dev/null +++ b/dev-python/itemadapter/itemadapter-0.7.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +inherit distutils-r1 + +DESCRIPTION="Common interface for scrapy data container classes" +HOMEPAGE="https://scrapy.org/" +SRC_URI="https://github.com/scrapy/itemadapter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT=0 +KEYWORDS="~amd64" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="${DEPEND} + test? ( + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/pydantic[${PYTHON_USEDEP}] + dev-python/scrapy[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/itemloaders/Manifest b/dev-python/itemloaders/Manifest index 48ec99822ae5..f7290f0b71b8 100644 --- a/dev-python/itemloaders/Manifest +++ b/dev-python/itemloaders/Manifest @@ -1 +1,2 @@ DIST itemloaders-1.0.4.tar.gz 26673 BLAKE2B a582a80a8a74be05c3e4770dc6fa017e43d20c496da79c5bb7ae9b02bdb282183347849e7a83b6174821fcc46d4021414b354537dc14291b6be82e774ffefd4e SHA512 b3f59c99db8dbf9757a304c55bd6b333347fdddc984edbeacd8314baaf8e319897b33801bc481d192330a573e75a6aa586d3da5bb11318287709723221bcbde6 +DIST itemloaders-1.0.6.tar.gz 26912 BLAKE2B b3925a4e06cc35d70fada0b43823fffc6cb37b16cea15438183adc728d08a47ab0d5bf721fcc7de18a60380faf2a17d38425eea3b2000209a5369dab21433106 SHA512 60f81dcaca51b9050c2a4a3abcedc9328943eda353a26c1ad28e489c338ea9d18d9ce76333d3d832746ce636571a1e49965f897bba7c4081d805684bb2ec2682 diff --git a/dev-python/itemloaders/itemloaders-1.0.6.ebuild b/dev-python/itemloaders/itemloaders-1.0.6.ebuild new file mode 100644 index 000000000000..3563e9fbacd2 --- /dev/null +++ b/dev-python/itemloaders/itemloaders-1.0.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +inherit distutils-r1 + +DESCRIPTION="Library to populate items using XPath and CSS with a convenient API" +HOMEPAGE="https://scrapy.org/" +SRC_URI="https://github.com/scrapy/itemloaders/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT=0 +KEYWORDS="~amd64" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + dev-python/itemadapter[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/parsel[${PYTHON_USEDEP}] + dev-python/w3lib[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild index ec843423d5fd..950250c66174 100644 --- a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild +++ b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild @@ -126,7 +126,7 @@ LICENSE="MIT Apache-2.0 PSF-2 BSD Boost-1.0 Unlicense" SLOT="0" KEYWORDS="~amd64" IUSE="test" -RESTRICT="!test? ( test )" +RESTRICT="test" RDEPEND=" >=dev-python/pyyaml-5.2[${PYTHON_USEDEP}] @@ -134,16 +134,15 @@ RDEPEND=" >=dev-python/typing-extensions-3.7.4.2[${PYTHON_USEDEP}] >=dev-python/typing_inspect-0.4.0[${PYTHON_USEDEP}] " -DEPEND=" - ${RDEPEND} - test? ( - ~dev-python/black-22.3.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-4.36.0[${PYTHON_USEDEP}] - >=dev-python/hypothesmith-0.0.4[${PYTHON_USEDEP}] - >=dev-python/prompt_toolkit-2.0.9[${PYTHON_USEDEP}] - ) -" -BDEPEND="test? ( dev-python/ufmt[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND}" +# test? ( +# ~dev-python/black-22.3.0[${PYTHON_USEDEP}] +# >=dev-python/hypothesis-4.36.0[${PYTHON_USEDEP}] +# >=dev-python/hypothesmith-0.0.4[${PYTHON_USEDEP}] +# >=dev-python/prompt_toolkit-2.0.9[${PYTHON_USEDEP}] +# ) +# " +# BDEPEND="test? ( dev-python/ufmt[${PYTHON_USEDEP}] )" distutils_enable_tests --install pytest diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild index 0c99013738b5..7e0be64ee52b 100644 --- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild @@ -30,7 +30,7 @@ SRC_URI=" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~riscv" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv" IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" # internal copy of pycxx highly patched diff --git a/dev-python/prawcore/prawcore-2.3.0.ebuild b/dev-python/prawcore/prawcore-2.3.0.ebuild index 4655bd79a36d..63758262559d 100644 --- a/dev-python/prawcore/prawcore-2.3.0.ebuild +++ b/dev-python/prawcore/prawcore-2.3.0.ebuild @@ -14,14 +14,13 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64" -RESTRICT="test" - RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" BDEPEND="test? ( =2.0.5' distribution was not found and is required by Scrapy +# https://bugs.gentoo.org/684734 +RDEPEND="${PYTHON_DEPS} + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/queuelib[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] + dev-python/w3lib[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + test? ( + dev-python/testfixtures[${PYTHON_USEDEP}] + dev-python/uvloop[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" ) + +python_test() { + py.test -vv --ignore=docs \ + --ignore="tests/test_proxy_connect.py" \ + --ignore="tests/test_utils_display.py" \ + --ignore="tests/test_command_check.py" \ + --ignore="tests/test_feedexport.py" \ + --ignore="tests/test_pipeline_files.py" \ + --ignore="tests/test_pipeline_images.py" \ + --ignore="tests/test_squeues.py" || die +} -- cgit v1.3