[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2023-11-01 Thread Michał Górny
commit: 7fc93707d88747fd5956c8eca529f39c0bb506be
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov  1 17:05:49 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov  1 17:09:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc93707

dev-python/pslab-python: Prepare for rename

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pslab-python/pslab-python-2.5.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-python/pslab-python/pslab-python-2.5.0.ebuild 
b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
index f01e7c9a4198..d5f734959f53 100644
--- a/dev-python/pslab-python/pslab-python-2.5.0.ebuild
+++ b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
+MY_P=pslab-python-${PV}
 DESCRIPTION="Python library for communicating with Pocket Science Lab"
 HOMEPAGE="
https://pslab.io/
@@ -16,8 +17,9 @@ HOMEPAGE="
 "
 SRC_URI="
https://github.com/fossasia/pslab-python/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz
+   -> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2023-11-01 Thread Michał Górny
commit: f11cbba9d2fa77ad53c9efdc400d8fd43c03b8c9
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov  1 17:00:56 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov  1 17:09:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11cbba9

dev-python/pslab-python: Enable py3.12

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pslab-python/pslab-python-2.5.0.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-python/pslab-python/pslab-python-2.5.0.ebuild 
b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
index 7af65721053b..f01e7c9a4198 100644
--- a/dev-python/pslab-python/pslab-python-2.5.0.ebuild
+++ b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -38,11 +38,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.5.0-ad9833_sys_version.patch
 )
 
-# Flaky in 2.5.0
 EPYTEST_DESELECT=(
+   # Flaky in 2.5.0
tests/test_logic_analyzer.py::test_stop
 )
 
-distutils_enable_tests pytest
-
 distutils_enable_sphinx docs dev-python/recommonmark
+distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2023-02-15 Thread Michał Górny
commit: 1355997e139057d267e45383033c73ce9992a4eb
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Feb 15 17:28:22 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb 15 17:28:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1355997e

dev-python/pslab-python: Enable py3.11

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pslab-python/Manifest  |  2 +-
 dev-python/pslab-python/metadata.xml  |  1 +
 dev-python/pslab-python/pslab-python-2.5.0.ebuild | 27 ---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index f33e127e0135..1b7fb58e68e3 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1 +1 @@
-DIST pslab-python-2.5.0.tar.gz 353493 BLAKE2B 
4eae07fec800dc357041578a75e48812848588e49e14b75425ee4b24c62b1116d0493055564188e33e4d934f4d572708c811ec9bb7fbf5d437befedfcad5da1a
 SHA512 
e8e4f53dc8c1d6aa4385cdbdc8a82bac21d9de15643980fed42a2b16c10ff56e0836371368840c9207d6bd6f8d73900a344507b8bce8b197f0580373137c0f1f
+DIST pslab-python-2.5.0.gh.tar.gz 353493 BLAKE2B 
4eae07fec800dc357041578a75e48812848588e49e14b75425ee4b24c62b1116d0493055564188e33e4d934f4d572708c811ec9bb7fbf5d437befedfcad5da1a
 SHA512 
e8e4f53dc8c1d6aa4385cdbdc8a82bac21d9de15643980fed42a2b16c10ff56e0836371368840c9207d6bd6f8d73900a344507b8bce8b197f0580373137c0f1f

diff --git a/dev-python/pslab-python/metadata.xml 
b/dev-python/pslab-python/metadata.xml
index 1570da2fec58..8c2314eeca2d 100644
--- a/dev-python/pslab-python/metadata.xml
+++ b/dev-python/pslab-python/metadata.xml
@@ -7,5 +7,6 @@


fossasia/pslab-python
+   pslab

 

diff --git a/dev-python/pslab-python/pslab-python-2.5.0.ebuild 
b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
index 184d8681cf20..7af65721053b 100644
--- a/dev-python/pslab-python/pslab-python-2.5.0.ebuild
+++ b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
@@ -3,25 +3,36 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 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"
+HOMEPAGE="
+   https://pslab.io/
+   https://github.com/fossasia/pslab-python/
+   https://pypi.org/project/pslab/
+"
+SRC_URI="
+   https://github.com/fossasia/pslab-python/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64"
 
-RDEPEND=">=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
+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}]
-)"
+   >=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



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/, dev-python/pslab-python/files/

2022-03-15 Thread Michał Górny
commit: e20a076b0f847a52021685048c34bd017cd4c74a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Mar 15 14:19:52 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar 15 14:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20a076b

dev-python/pslab-python: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pslab-python/Manifest   |  1 -
 .../pslab-python-1.0.1-no_install_udev_rules.patch |  9 ---
 .../files/pslab-python-1.0.1-sys_version.patch | 11 -
 .../pslab-python/pslab-python-1.0.1-r1.ebuild  | 28 --
 4 files changed, 49 deletions(-)

diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index 4e36b7586ba2..f33e127e0135 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1,2 +1 @@
-DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 
6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6
 SHA512 
939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
 DIST pslab-python-2.5.0.tar.gz 353493 BLAKE2B 
4eae07fec800dc357041578a75e48812848588e49e14b75425ee4b24c62b1116d0493055564188e33e4d934f4d572708c811ec9bb7fbf5d437befedfcad5da1a
 SHA512 
e8e4f53dc8c1d6aa4385cdbdc8a82bac21d9de15643980fed42a2b16c10ff56e0836371368840c9207d6bd6f8d73900a344507b8bce8b197f0580373137c0f1f

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..
--- 
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-1.0.1-sys_version.patch
deleted file mode 100644
index 474850a34b08..
--- a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/PSL/SENSORS/AD9833.py
-+++ b/PSL/SENSORS/AD9833.py
-@@ -3,7 +3,7 @@
- 
- 
- class AD9833:
--if sys.version.major == 3:
-+if sys.version_info.major == 3:
- DDS_MAX_FREQ = 0xFFF - 1  # 24 bit resolution
- else:
- DDS_MAX_FREQ = eval("0xFFFL-1")  # 24 bit resolution

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..
--- 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



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2022-03-15 Thread Jakov Smolić
commit: acfaf5cb63348d75be5ad80673c1424ce75963c1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar 15 13:05:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar 15 13:05:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfaf5cb

dev-python/pslab-python: Stabilize 2.5.0 amd64, #835245

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-python/pslab-python/pslab-python-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pslab-python/pslab-python-2.5.0.ebuild 
b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
index acc28d08330a..a5314c5da29a 100644
--- a/dev-python/pslab-python/pslab-python-2.5.0.ebuild
+++ b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/, dev-python/pslab-python/files/

2022-02-07 Thread Marek Szuba
commit: 55d57c2b0758ec4de962c345ccfcf9f4e783df5b
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Feb  7 16:16:59 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Feb  7 16:17:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55d57c2b

dev-python/pslab-python: add 2.5.0

Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pslab-python/Manifest   |  1 +
 .../pslab-python-2.5.0-ad9833_sys_version.patch| 11 +++
 dev-python/pslab-python/pslab-python-2.5.0.ebuild  | 37 ++
 3 files changed, 49 insertions(+)

diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index 607e84c133d8..4e36b7586ba2 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1 +1,2 @@
 DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 
6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6
 SHA512 
939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
+DIST pslab-python-2.5.0.tar.gz 353493 BLAKE2B 
4eae07fec800dc357041578a75e48812848588e49e14b75425ee4b24c62b1116d0493055564188e33e4d934f4d572708c811ec9bb7fbf5d437befedfcad5da1a
 SHA512 
e8e4f53dc8c1d6aa4385cdbdc8a82bac21d9de15643980fed42a2b16c10ff56e0836371368840c9207d6bd6f8d73900a344507b8bce8b197f0580373137c0f1f

diff --git 
a/dev-python/pslab-python/files/pslab-python-2.5.0-ad9833_sys_version.patch 
b/dev-python/pslab-python/files/pslab-python-2.5.0-ad9833_sys_version.patch
new file mode 100644
index ..b34182266c4a
--- /dev/null
+++ b/dev-python/pslab-python/files/pslab-python-2.5.0-ad9833_sys_version.patch
@@ -0,0 +1,11 @@
+--- a/pslab/external/AD9833.py
 b/pslab/external/AD9833.py
+@@ -2,7 +2,7 @@
+ 
+ 
+ class AD9833:
+-if sys.version.major == 3:
++if sys.version_info.major == 3:
+ DDS_MAX_FREQ = 0xFFF - 1  # 24 bit resolution
+ else:
+ DDS_MAX_FREQ = eval("0xFFFL-1")  # 24 bit resolution

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 ..acc28d08330a
--- /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



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-11-24 Thread Marek Szuba
commit: b9a09f2bf8d9bafe96e45c9058a879df8c6dac83
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 24 13:23:09 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 24 13:23:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a09f2b

dev-python/pslab-python: support python3_9

Seems to work fine.

Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 0b79bdd0a05..b56fef33cdc 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-05-16 Thread Mikle Kolyada
commit: f3b75e04d95f44e21ad5c86430ed9013357a992d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May 16 11:17:07 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May 16 11:17:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b75e04

dev-python/pslab-python: Drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-python/pslab-python/pslab-python-1.0.1.ebuild | 40 ---
 1 file changed, 40 deletions(-)

diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild 
b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
deleted file mode 100644
index 37e2f52f9bd..000
--- a/dev-python/pslab-python/pslab-python-1.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-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"
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-python/numpy
-   dev-python/pyqtgraph
-   dev-python/pyserial
-   sci-libs/scipy"
-DEPEND="${RDEPEND}
-   doc? ( dev-python/sphinx )"
-BDEPEND="dev-python/setuptools"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.1-sys_version.patch
-   "${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch
-)
-
-python_compile_all() {
-   use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-   use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-   distutils-r1_python_install_all
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-05-16 Thread Mikle Kolyada
commit: b8b3feb899742da09e7f5161762d31d3822f279f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May 16 11:16:33 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May 16 11:17:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b3feb8

dev-python/pslab-python: mark stable

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index e87f109dd51..9701c59385a 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pyqtgraph[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-04-24 Thread Marek Szuba
commit: a24a33d5cf21de68039371057540185ee828d686
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 24 22:58:13 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 24 22:58:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24a33d5

dev-python/pslab-python: support python3_8, drop python3_6

The latter is necessary due to there being no dev-python/pyqtgraph which
supports both 3.6 and 3.8.

Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index ee580736dab..e87f109dd51 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-04-22 Thread Marek Szuba
commit: c754d7d11079ed85db0d17d89b6012d9399af788
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr 22 22:43:02 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr 22 23:47:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c754d7d1

dev-python/pslab-python: fix dependencies, again

One, this is a multi-implementation package so we do not want
dependencies to be conditional.

Two, no need to set DEPEND.

Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

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
index 71659cc6f68..ee580736dab 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -15,14 +15,10 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="
-   $(python_gen_cond_dep '
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pyqtgraph[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   ')"
-DEPEND="${RDEPEND}"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyqtgraph[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.0.1-sys_version.patch



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-04-21 Thread Marek Szuba
commit: 2e4d1f7f3e459026eefc17097d45e15c10868eb7
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Apr 21 15:48:49 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Apr 21 15:51:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4d1f7f

dev-python/pslab-python: support python3_7

Also make better use of distutils-r1 and make Python dependencies
actually sane (no idea what I was on when I committed that).

Nb. having had a look at upstream CI this *should* work with 3.8 as
well, will have to add support for this version to dev-python/pyqtgraph
first though.

Signed-off-by: Marek Szuba  gentoo.org>

 .../pslab-python/pslab-python-1.0.1-r1.ebuild  | 32 ++
 1 file changed, 32 insertions(+)

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
new file mode 100644
index 000..71659cc6f68
--- /dev/null
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+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="
+   $(python_gen_cond_dep '
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyqtgraph[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   ')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.1-sys_version.patch
+   "${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch
+)
+
+distutils_enable_sphinx docs



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/

2020-03-20 Thread Agostino Sarubbo
commit: 91f19db17ebecf21284e912c2dca8c0598392c78
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 20 08:56:43 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 20 08:56:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f19db1

dev-python/pslab-python: amd64 stable wrt bug #713256

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-python/pslab-python/pslab-python-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild 
b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
index 22befe0156f..37e2f52f9bd 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pslab-python/, dev-python/pslab-python/files/

2019-06-28 Thread Marek Szuba
commit: 1abca237df4ea8babf6b00af64b5bde541915493
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jun 28 18:38:52 2019 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jun 28 18:39:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abca237

dev-python/pslab-python: new package

Official library for communicating with the Pocket Science Lab, a
universal USB-powered board featuring an oscilloscope, multimeter, logic
analyser and many more.

Signed-off-by: Marek Szuba  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-python/pslab-python/Manifest   |  1 +
 .../pslab-python-1.0.1-no_install_udev_rules.patch |  9 +
 .../files/pslab-python-1.0.1-sys_version.patch | 11 ++
 dev-python/pslab-python/metadata.xml   | 11 ++
 dev-python/pslab-python/pslab-python-1.0.1.ebuild  | 40 ++
 5 files changed, 72 insertions(+)

diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
new file mode 100644
index 000..607e84c133d
--- /dev/null
+++ b/dev-python/pslab-python/Manifest
@@ -0,0 +1 @@
+DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 
6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6
 SHA512 
939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2

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
new file mode 100644
index 000..b721e8a8ab0
--- /dev/null
+++ 
b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
@@ -0,0 +1,9 @@
+--- 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-1.0.1-sys_version.patch
new file mode 100644
index 000..474850a34b0
--- /dev/null
+++ b/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
@@ -0,0 +1,11 @@
+--- a/PSL/SENSORS/AD9833.py
 b/PSL/SENSORS/AD9833.py
+@@ -3,7 +3,7 @@
+ 
+ 
+ class AD9833:
+-if sys.version.major == 3:
++if sys.version_info.major == 3:
+ DDS_MAX_FREQ = 0xFFF - 1  # 24 bit resolution
+ else:
+ DDS_MAX_FREQ = eval("0xFFFL-1")  # 24 bit resolution

diff --git a/dev-python/pslab-python/metadata.xml 
b/dev-python/pslab-python/metadata.xml
new file mode 100644
index 000..d93b6e0e274
--- /dev/null
+++ b/dev-python/pslab-python/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   mare...@gentoo.org
+   Marek Szuba
+   
+   
+   fossasia/pslab-python
+   
+

diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild 
b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
new file mode 100644
index 000..b3feed3e628
--- /dev/null
+++ b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+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"
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-python/numpy
+   dev-python/pyqtgraph
+   dev-python/pyserial
+   sci-libs/scipy"
+DEPEND="${RDEPEND}
+   doc? ( dev-python/sphinx )"
+BDEPEND="dev-python/setuptools"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.1-sys_version.patch
+   "${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch
+)
+
+python_compile_all() {
+   use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+   use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+   distutils-r1_python_install_all
+}