* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyqtgraph/files/, dev-python/pyqtgraph/
@ 2020-04-24 23:11 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-04-24 23:11 UTC (permalink / raw
To: gentoo-commits
commit: 530156324d4c5acd0aa63fb6b520453c576b09c4
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 15:42:23 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 22:56:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53015632
dev-python/pyqtgraph: bump to 0.11.0_rc0 and EAPI-7
The only version to date with python3_8 support. Ostensibly a release
candidate but if it's good enough for Debian to package then it's good
enough for me!
Committed with kind permission of mgorny on behalf of the Python
project.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-python/pyqtgraph/Manifest | 1 +
.../files/pyqtgraph-0.11.0-qt5_only.patch | 11 +++++
dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild | 48 ++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index ae3b55682a0..5b078024ea7 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1 +1,2 @@
DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
+DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch
new file mode 100644
index 00000000000..1e65b0de926
--- /dev/null
+++ b/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch
@@ -0,0 +1,11 @@
+--- a/pyqtgraph/Qt.py
++++ b/pyqtgraph/Qt.py
+@@ -25,7 +25,7 @@
+ ## This is done by first checking to see whether one of the libraries
+ ## is already imported. If not, then attempt to import PyQt4, then PySide.
+ if QT_LIB is None:
+- libOrder = [PYQT4, PYSIDE, PYQT5, PYSIDE2]
++ libOrder = [PYQT5]
+
+ for lib in libOrder:
+ if lib in sys.modules:
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
new file mode 100644
index 00000000000..f13ada12b64
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+MY_PV=$(ver_rs 3 "")
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl svg"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.11.0-qt5_only.patch
+)
+
+DOCS=( CHANGELOG README.md )
+
+S="${WORKDIR}"/${PN}-${MY_P}
+
+distutils_enable_sphinx doc/source
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if ! use opengl; then
+ rm -r pyqtgraph/opengl || die
+ fi
+}
+
+python_install_all() {
+ use examples && DOCS+=( examples/ )
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyqtgraph/files/, dev-python/pyqtgraph/
@ 2021-04-28 17:50 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-04-28 17:50 UTC (permalink / raw
To: gentoo-commits
commit: a896966bca383d25d6ec4b579e25ce56b6b2b62c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 17:48:40 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 17:50:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a896966b
dev-python/pyqtgraph: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pyqtgraph/Manifest | 2 -
.../files/pyqtgraph-0.11.0-qt5_only.patch | 11 ---
dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild | 48 ------------
dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild | 86 ----------------------
4 files changed, 147 deletions(-)
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 9df18fd3548..f64219dc7ab 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,2 @@
-DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
-DIST pyqtgraph-0.12.0.tar.gz 893557 BLAKE2B a5fab600adad7b71d63602ed075ecdfba96316ffd1205a11c6551c132055c40f81bbac4a51e9abcfdb877365f1e95d1f05d0fdcc7131cf5f0646f641512e70aa SHA512 a30c7cab0a8a1efff697271fdcc27b1aef55a2766a90562191adc4d6e5ed6fb71da73b4b25ea4e16b7eff33876eb47468c27bc8bcdf1a0abaefa2b6c202c8739
DIST pyqtgraph-0.12.1.tar.gz 899513 BLAKE2B 17f6dec41039186ceb0afdfbcba64aebf5900d17b890d9a6d1f8a30586a27e3cc61bb1d3a8fb2446f9ee3a66c54095b7c5d37b5c5fb83296b481d8a95a7fdab5 SHA512 b1ed004c7db4ee4f8302a42dd9e8574692b4c353bf512ec7a42d5ebeaab126e9ed5df3a228c631dc77e16a61efce1c918cbd0a8b319649e346e2082215c56d40
DIST pyqtgraph-test-data-8.tar.gz 306068 BLAKE2B f3aa418dfaf2e74950fa880da4b6dfb4ef5dbd46346b78065d885c1f9fc06fc3de86756af17e27035d4cd47d98cc7ce58c036b493837b568086a4ebceb230c78 SHA512 07ef414f2b57e00589f8c18459e88ab16001c7cc3766164cdfcd69faa26cbc90ed64611fd0c5e3b401dc6a3f1a6e9e4ce6a7d9fa96ebcc4360e03fa9fbb856d2
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch
deleted file mode 100644
index 1e65b0de926..00000000000
--- a/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pyqtgraph/Qt.py
-+++ b/pyqtgraph/Qt.py
-@@ -25,7 +25,7 @@
- ## This is done by first checking to see whether one of the libraries
- ## is already imported. If not, then attempt to import PyQt4, then PySide.
- if QT_LIB is None:
-- libOrder = [PYQT4, PYSIDE, PYQT5, PYSIDE2]
-+ libOrder = [PYQT5]
-
- for lib in libOrder:
- if lib in sys.modules:
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
deleted file mode 100644
index c6a713fe7b5..00000000000
--- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PV=$(ver_rs 3 "")
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples opengl svg"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-qt5_only.patch
-)
-
-DOCS=( CHANGELOG README.md )
-
-S="${WORKDIR}"/${PN}-${MY_P}
-
-distutils_enable_sphinx doc/source
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use opengl; then
- rm -r pyqtgraph/opengl || die
- fi
-}
-
-python_install_all() {
- use examples && DOCS+=( examples/ )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild
deleted file mode 100644
index 1ebdf584d19..00000000000
--- a/dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 multiprocessing virtualx
-
-TEST_DATA_TAG=test-data-8
-DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
-SRC_URI="
- https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
- test? (
- https://github.com/pyqtgraph/test-data/archive/${TEST_DATA_TAG}.tar.gz
- -> ${PN}-${TEST_DATA_TAG}.tar.gz
- )"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples opengl svg"
-
-RDEPEND="
- >=dev-python/numpy-1.17[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-BDEPEND="
- test? (
- dev-python/h5py[${PYTHON_USEDEP}]
- dev-python/PyQt5[svg,testlib,${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if use test; then
- mkdir "${HOME}"/.pyqtgraph || die
- mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
- "${HOME}"/.pyqtgraph/test-data || die
- cd "${HOME}"/.pyqtgraph/test-data || die
- # we need to fake a git repo
- git config --global user.email "you@example.com"
- git config --global user.name "Your Name"
- git init -q || die
- git commit -q --allow-empty -m "dummy commit" || die
- git tag "${TEST_DATA_TAG}" || die
- cd - >/dev/null || die
- fi
- if ! use opengl; then
- rm -r pyqtgraph/opengl || die
- fi
-}
-
-python_test() {
- local deselect=(
- # apparently fragile
- --deselect pyqtgraph/tests/test_reload.py::test_reload
-
- # pyside2 is normally skipped if not installed but these two
- # fail if it is installed
- # TODO: this could be due to USE flags, revisit when pyside2
- # gains py3.9
- --deselect
- 'examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
- --deselect
- 'examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
- )
-
- distutils_install_for_testing
- virtx epytest "${deselect[@]}" \
- -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
- use examples && DOCS+=( examples/ )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-28 17:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-28 17:50 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyqtgraph/files/, dev-python/pyqtgraph/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-04-24 23:11 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox