* [gentoo-commits] repo/gentoo:master commit in: dev-python/mygpoclient/files/, dev-python/mygpoclient/
@ 2018-11-11 18:34 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-11-11 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 1c915cfe17a3100569ca8734309ba1ceb77ac2a6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 18:34:23 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 18:34:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c915cfe
dev-python/mygpoclient: Commit updated patch
Bug: https://bugs.gentoo.org/615548
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../mygpoclient/files/mygpoclient-1.8-tests.patch | 34 ++++++++++++++++++++++
dev-python/mygpoclient/mygpoclient-1.8.ebuild | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
new file mode 100644
index 00000000000..94a37be8232
--- /dev/null
+++ b/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
@@ -0,0 +1,34 @@
+diff -Naur a/mygpoclient/locator_test.py b/mygpoclient/locator_test.py
+--- a/mygpoclient/locator_test.py 2018-03-27 02:18:57.711105496 -0300
++++ b/mygpoclient/locator_test.py 2018-03-27 02:22:02.201109125 -0300
+@@ -16,7 +16,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ from mygpoclient import locator
+-import unittest
++import unittest, sys
+
+ class Test_Exceptions(unittest.TestCase):
+ def setUp(self):
+@@ -54,18 +54,21 @@
+ podcast='http://example.org/episodes.rss',
+ device_id='gpodder')
+
++ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+ def test_device_settings_uri_exception(self):
+ """Test if using no parameter for a device Setting raises a ValueError"""
+ self.assertRaises(ValueError,
+ self.locator.settings_uri, type='device',
+ scope_param1=None, scope_param2=None)
+
++ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+ def test_podcast_settings_uri_exception(self):
+ """Test if using no parameter for a podcast Setting raises a ValueError"""
+ self.assertRaises(ValueError,
+ self.locator.settings_uri, type='podcast',
+ scope_param1=None, scope_param2=None)
+
++ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+ def test_episode_settings_uri_exception(self):
+ """Test if only using one parameter for a episode Setting raises a ValueError"""
+ self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index bb56a43f3a0..aeb31ddbad6 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( "${FILESDIR}"/tests.patch )
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
src_prepare() {
distutils-r1_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/mygpoclient/files/, dev-python/mygpoclient/
@ 2022-01-28 11:51 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2022-01-28 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 9c9be7aed5a49a06c58e938d9d1addd41303debe
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 28 11:47:43 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 11:50:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c9be7ae
dev-python/mygpoclient: enable py3.10, ebuild cleanup
Closes: https://bugs.gentoo.org/745948
Closes: https://bugs.gentoo.org/723736
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../files/mygpoclient-1.8-fix-literal.patch | 35 +++++++++++++++++++++
dev-python/mygpoclient/mygpoclient-1.8.ebuild | 36 ++++++++--------------
2 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch
new file mode 100644
index 000000000000..372d0bc2bc40
--- /dev/null
+++ b/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch
@@ -0,0 +1,35 @@
+From bdf8c8ce38cff8938bab3544c6dbb0d509ce7720 Mon Sep 17 00:00:00 2001
+From: Eric Le Lay <elelay@macports.org>
+Date: Sun, 22 Mar 2020 16:19:08 +0100
+Subject: [PATCH] use == for comparison with literal
+
+See https://bugs.python.org/issue34850
+---
+ mygpoclient/locator.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mygpoclient/locator.py b/mygpoclient/locator.py
+index c0dc9d7..810f973 100644
+--- a/mygpoclient/locator.py
++++ b/mygpoclient/locator.py
+@@ -317,17 +317,17 @@ def settings_uri(self, type, scope_param1, scope_param2):
+
+ filename = self._username + '/%(type)s.json' % locals()
+
+- if type is 'device':
++ if type == 'device':
+ if scope_param1 is None:
+ raise ValueError('Devicename not specified')
+ filename += '?device=%(scope_param1)s' % locals()
+
+- if type is 'podcast':
++ if type == 'podcast':
+ if scope_param1 is None:
+ raise ValueError('Podcast URL not specified')
+ filename += '?podcast=%s' % quote(scope_param1)
+
+- if type is 'episode':
++ if type == 'episode':
+ if (scope_param1 is None) or (scope_param2 is None):
+ raise ValueError('Podcast or Episode URL not specified')
+ filename += '?podcast=%s&episode=%s' % (quote(scope_param1), quote(scope_param2))
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index 9c66b03f5c3a..7992f3b024a2 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="A gpodder.net client library"
@@ -14,34 +14,24 @@ SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/minimock
- )
-"
+BDEPEND="test? ( dev-python/minimock[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-literal.patch
+ "${FILESDIR}"/${PN}-1.8-tests.patch
+)
+
+distutils_enable_tests nose
src_prepare() {
- distutils-r1_src_prepare
# Disable tests requring network connection.
- rm -f mygpoclient/http_test.py
-}
+ rm mygpoclient/http_test.py || die
-python_test() {
- if [[ "${EPYTHON:0:4}" == "pypy" ]]; then
- nosetests --cover-erase --with-coverage --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
- else
- nosetests --cover-erase --with-coverage --with-doctest --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
- fi
+ distutils-r1_src_prepare
}
src_install() {
distutils-r1_src_install
- rm -f $(find "${D}" -name "*_test.py")
+ find "${D}" -name "*_test.py" -delete || die
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/mygpoclient/files/, dev-python/mygpoclient/
@ 2022-07-24 20:33 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-07-24 20:33 UTC (permalink / raw
To: gentoo-commits
commit: a51ecc63ea7a099cb9a4b454e6eb2ddc6d93759d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 20:31:58 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 20:31:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51ecc63
dev-python/mygpoclient: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/mygpoclient/Manifest | 1 -
.../files/mygpoclient-1.8-fix-literal.patch | 35 --------------------
.../mygpoclient/files/mygpoclient-1.8-tests.patch | 34 --------------------
dev-python/mygpoclient/mygpoclient-1.8.ebuild | 37 ----------------------
4 files changed, 107 deletions(-)
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index b25514c7febf..94ea6be8b08d 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,2 +1 @@
-DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
DIST mygpoclient-1.9.gh.tar.gz 44998 BLAKE2B 5feb17fbcdd02c632a11d9ae685b099addd2fed056e72d532e6391b707cfc46e694182ea4e5d7334be10796b5bb19b2d8cbceafe0b69798206f5ec41ca337913 SHA512 57502295725d3a1351e877998442141dd596927215d3746786c12db061ebe3bdf8282e8b2d554997515a558f608c0815e4caad311ad3f1ea9f5b62321e8d6635
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch
deleted file mode 100644
index 372d0bc2bc40..000000000000
--- a/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bdf8c8ce38cff8938bab3544c6dbb0d509ce7720 Mon Sep 17 00:00:00 2001
-From: Eric Le Lay <elelay@macports.org>
-Date: Sun, 22 Mar 2020 16:19:08 +0100
-Subject: [PATCH] use == for comparison with literal
-
-See https://bugs.python.org/issue34850
----
- mygpoclient/locator.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mygpoclient/locator.py b/mygpoclient/locator.py
-index c0dc9d7..810f973 100644
---- a/mygpoclient/locator.py
-+++ b/mygpoclient/locator.py
-@@ -317,17 +317,17 @@ def settings_uri(self, type, scope_param1, scope_param2):
-
- filename = self._username + '/%(type)s.json' % locals()
-
-- if type is 'device':
-+ if type == 'device':
- if scope_param1 is None:
- raise ValueError('Devicename not specified')
- filename += '?device=%(scope_param1)s' % locals()
-
-- if type is 'podcast':
-+ if type == 'podcast':
- if scope_param1 is None:
- raise ValueError('Podcast URL not specified')
- filename += '?podcast=%s' % quote(scope_param1)
-
-- if type is 'episode':
-+ if type == 'episode':
- if (scope_param1 is None) or (scope_param2 is None):
- raise ValueError('Podcast or Episode URL not specified')
- filename += '?podcast=%s&episode=%s' % (quote(scope_param1), quote(scope_param2))
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
deleted file mode 100644
index 94a37be8232f..000000000000
--- a/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur a/mygpoclient/locator_test.py b/mygpoclient/locator_test.py
---- a/mygpoclient/locator_test.py 2018-03-27 02:18:57.711105496 -0300
-+++ b/mygpoclient/locator_test.py 2018-03-27 02:22:02.201109125 -0300
-@@ -16,7 +16,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- from mygpoclient import locator
--import unittest
-+import unittest, sys
-
- class Test_Exceptions(unittest.TestCase):
- def setUp(self):
-@@ -54,18 +54,21 @@
- podcast='http://example.org/episodes.rss',
- device_id='gpodder')
-
-+ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
- def test_device_settings_uri_exception(self):
- """Test if using no parameter for a device Setting raises a ValueError"""
- self.assertRaises(ValueError,
- self.locator.settings_uri, type='device',
- scope_param1=None, scope_param2=None)
-
-+ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
- def test_podcast_settings_uri_exception(self):
- """Test if using no parameter for a podcast Setting raises a ValueError"""
- self.assertRaises(ValueError,
- self.locator.settings_uri, type='podcast',
- scope_param1=None, scope_param2=None)
-
-+ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
- def test_episode_settings_uri_exception(self):
- """Test if only using one parameter for a episode Setting raises a ValueError"""
- self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
deleted file mode 100644
index 7992f3b024a2..000000000000
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A gpodder.net client library"
-HOMEPAGE="https://github.com/gpodder/mygpoclient
- https://mygpoclient.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? ( dev-python/minimock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-literal.patch
- "${FILESDIR}"/${PN}-1.8-tests.patch
-)
-
-distutils_enable_tests nose
-
-src_prepare() {
- # Disable tests requring network connection.
- rm mygpoclient/http_test.py || die
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- distutils-r1_src_install
- find "${D}" -name "*_test.py" -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-24 20:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-28 11:51 [gentoo-commits] repo/gentoo:master commit in: dev-python/mygpoclient/files/, dev-python/mygpoclient/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2022-07-24 20:33 Michał Górny
2018-11-11 18:34 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox