gentoo resync : 20.03.2022

5 files changed, 43 insertions, 44 deletions

diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index 431c4deb4b5a..f2b183a6e036 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1,5 +1,4 @@
-AUX pslab-python-1.0.1-no_install_udev_rules.patch 313 BLAKE2B ec6b728082006c23c500959e639cd2c80c432922e4a6277826ffc3ac6236fde35983b00391475b2d3f0563f2143360e6e83eb3d587cbffb7d4a6e0a8a227255d SHA512 7af64c38503a9857e724a0d5744b82f569d39effdf2218628ba72ea29008b666384c0666c6b26ed8a84bcaa9caecf45885c5ec965757791c77047256d7764051
-AUX pslab-python-1.0.1-sys_version.patch 296 BLAKE2B 317af730f51ec96b73e31f5d1da981b71ed39bc48fda426aec177998971ae69db457a4eda6193cdc1a85f0215196c6da17437c5de5f70d50bb97effb3d5ca1fd SHA512 36b6f18af550a8bf72e79fcc99e53e356b359e5de62043829c7e52d51753e17078a170b6bfee68ab5225cf4282c5ebc50a8913bf050b7a9258d9be52382f324f
-DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6 SHA512 939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
-EBUILD pslab-python-1.0.1-r1.ebuild 697 BLAKE2B f99eee633ac9b7c5473580c11232d49bbdb42b366493bce889f497fe8d20f4ee5ff3fde05dce2952de2c24064bf688cc164cc4143860725ee4bde121a60d5346 SHA512 226db26d1475449bacc088ffd08b084b5f06065b44d9dcd24a1f9ed3fb4310aaf1e4a4441b9690c175d977d93a0bb1b8244c8e687182cf788802501bd2974c17
+AUX pslab-python-2.5.0-ad9833_sys_version.patch 302 BLAKE2B fba89ba6c99024b14106c6b9b1d0783a0d330b368237412043098f94bf3f53bee4a7c35933b66037fb2985aa0954a31171976625c3d1731f961d169d3153878f SHA512 822ae24fd8a02ae5c075a45a8cfd1c174f8cbe11ba2b6f97ef5724e7365942aa150837d7feeede38706b7d0c19f315e585090952bf2066a135acfc0eff65584b
+DIST pslab-python-2.5.0.tar.gz 353493 BLAKE2B 4eae07fec800dc357041578a75e48812848588e49e14b75425ee4b24c62b1116d0493055564188e33e4d934f4d572708c811ec9bb7fbf5d437befedfcad5da1a SHA512 e8e4f53dc8c1d6aa4385cdbdc8a82bac21d9de15643980fed42a2b16c10ff56e0836371368840c9207d6bd6f8d73900a344507b8bce8b197f0580373137c0f1f
+EBUILD pslab-python-2.5.0.ebuild 862 BLAKE2B c35beb29c75395483ba08e749ffbf24f13e418b6c8cd2980c678c8e2733ece437047f530edbb1037769bd4b81e2f7fb7923dbf78c04445a91bd9d721022b7875 SHA512 6b27940c685ef3f2e7fdb2db788f5909e62cb48f90d9833827b91f1bb3031bd18aeab20b28a9b87450c8365b8954b1567bc05b9f7a3a8fb1b51ff5183f029b48
 MISC metadata.xml 332 BLAKE2B 4d0b39359555234a48f942867fa6e449d7cecfeac82abc9f0ffb8a724a15e2f5606b20def9209bdb4ac0243c728d11c38d1ab57a257b7f954fed0be817553dfd SHA512 acf8d0ac7a7ff91a7a040e163fda070affbaf030dce6a15d2e170d12a548bb16dea783fb23fa73acd6fb67fb0d14d780ba214aae6268764e2b46feaecdbdfba4
diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
deleted file mode 100644
index b721e8a8ab03..000000000000
--- a/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -50,6 +50,5 @@
-     packages=find_packages(),
-     #scripts=["PSL/bin/"+a for a in os.listdir("PSL/bin/")],
-     package_data={'': ['*.css','*.png','*.gif','*.html','*.css','*.js','*.png','*.jpg','*.jpeg','*.htm','99-pslab.rules']},
--    cmdclass={'install': CustomInstall},
- )
- 
diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch b/dev-python/pslab-python/files/pslab-python-2.5.0-ad9833_sys_version.patch
index 474850a34b08..b34182266c4a 100644
--- a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
+++ b/dev-python/pslab-python/files/pslab-python-2.5.0-ad9833_sys_version.patch
@@ -1,6 +1,6 @@
---- a/PSL/SENSORS/AD9833.py
-+++ b/PSL/SENSORS/AD9833.py
-@@ -3,7 +3,7 @@
+--- a/pslab/external/AD9833.py
++++ b/pslab/external/AD9833.py
+@@ -2,7 +2,7 @@
  
  
  class AD9833:
diff --git a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
deleted file mode 100644
index b56fef33cdc7..000000000000
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +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
-
-DESCRIPTION="Python library for communicating with Pocket Science Lab"
-HOMEPAGE="https://pslab.io"
-SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyqtgraph[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-sys_version.patch
-	"${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch
-)
-
-distutils_enable_sphinx docs
diff --git a/dev-python/pslab-python/pslab-python-2.5.0.ebuild b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
new file mode 100644
index 000000000000..a5314c5da29a
--- /dev/null
+++ b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for communicating with Pocket Science Lab"
+HOMEPAGE="https://pslab.io"
+SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND=">=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.3.0[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-ad9833_sys_version.patch
+)
+
+# Flaky in 2.5.0
+EPYTEST_DESELECT=(
+	tests/test_logic_analyzer.py::test_stop
+)
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs dev-python/recommonmark