diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest index ace947207a..b4bc81969d 100644 --- a/dev-python/tekore/Manifest +++ b/dev-python/tekore/Manifest @@ -1 +1 @@ -DIST tekore-1.0.1.tar.gz 130077 BLAKE2B 21550c7545125248a0f8ac61eb1c97e80b299de38940ec36b20dbc73fc8224cc703955b0e6aefac1fdd98d59a55e67d24995dcbbeb17f8670515d7acea86be16 SHA512 fb02005990daff11b0c3d7881ad2842578a35e0e62fec5130506d4df48311c2cceae9e7d3a322ad8058a058fdc92bac06533b958be2b57a9d8e85e16c39ef062 +DIST tekore-1.1.0.tar.gz 138871 BLAKE2B 5580c502129ed1fd9c7a7f6a860d918a0a46f6ac51a3f6bef5f08c1e036756684d11c670e55343c27ff3dd7a40fa45b2307a9a27b594558525b7d4a41617908c SHA512 968315f3818803f076798a88f791ca10a4a118850ee730d449e2db8e5d5aca00293f8d8483a4d9edb9802b103aa6328a7514f58f4959bb0a551ed11b065ece87 diff --git a/dev-python/tekore/files/tekore-1.0.1-skip-sender_type-tests.patch b/dev-python/tekore/files/tekore-1.0.1-skip-sender_type-tests.patch deleted file mode 100644 index 3ab0043021..0000000000 --- a/dev-python/tekore/files/tekore-1.0.1-skip-sender_type-tests.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/tests/sender.py b/tests/sender.py -index 0f9334b..5c5966f 100644 ---- a/tests/sender.py -+++ b/tests/sender.py -@@ -55,22 +55,22 @@ class TestSingletonSender(unittest.TestCase): - ) - - --def test_request_prepared(sender_type): -- mock = MockSessionFactory() -- with patch('tekore.sender.Session', mock): -- s = sender_type() -- r = Request() -- s.send(r) -- mock.instances[0].prepare_request.assert_called_with(r) -- -- --def test_keywords_passed_to_session(sender_type): -- mock = MockSessionFactory() -- kwargs = dict(k1='k1', k2='k2') -- with patch('tekore.sender.Session', mock): -- s = sender_type(**kwargs) -- s.send(Request()) -- mock.instances[0].send.assert_called_with(mock.prepare_return, **kwargs) -+# def test_request_prepared(sender_type): -+# mock = MockSessionFactory() -+# with patch('tekore.sender.Session', mock): -+# s = sender_type() -+# r = Request() -+# s.send(r) -+# mock.instances[0].prepare_request.assert_called_with(r) -+ -+ -+# def test_keywords_passed_to_session(sender_type): -+# mock = MockSessionFactory() -+# kwargs = dict(k1='k1', k2='k2') -+# with patch('tekore.sender.Session', mock): -+# s = sender_type(**kwargs) -+# s.send(Request()) -+# mock.instances[0].send.assert_called_with(mock.prepare_return, **kwargs) - - - class TestPersistentSender(unittest.TestCase): -@@ -88,11 +88,11 @@ class TestPersistentSender(unittest.TestCase): - s2 = PersistentSender() - self.assertTrue(s1.session is not s2.session) - -- def test_request_prepared(self): -- test_request_prepared(PersistentSender) -+ # def test_request_prepared(self): -+ # test_request_prepared(PersistentSender) - -- def test_keywords_passed_to_session(self): -- test_keywords_passed_to_session(PersistentSender) -+ # def test_keywords_passed_to_session(self): -+ # test_keywords_passed_to_session(PersistentSender) - - - class TestTransientSender(unittest.TestCase): -@@ -104,11 +104,11 @@ class TestTransientSender(unittest.TestCase): - s.send(Request()) - self.assertEqual(len(mock.instances), 2) - -- def test_request_prepared(self): -- test_request_prepared(TransientSender) -+ # def test_request_prepared(self): -+ # test_request_prepared(TransientSender) - -- def test_keywords_passed_to_session(self): -- test_keywords_passed_to_session(TransientSender) -+ # def test_keywords_passed_to_session(self): -+ # test_keywords_passed_to_session(TransientSender) - - - def ok_response() -> MagicMock: diff --git a/dev-python/tekore/metadata.xml b/dev-python/tekore/metadata.xml index dd0bd9c021..628ab20176 100644 --- a/dev-python/tekore/metadata.xml +++ b/dev-python/tekore/metadata.xml @@ -6,8 +6,4 @@ andrewammerlaan@riseup.net Andrew Ammerlaan - - proxy-maint@gentoo.org - Proxy Maintainers - diff --git a/dev-python/tekore/tekore-1.0.1.ebuild b/dev-python/tekore/tekore-1.1.0.ebuild similarity index 51% rename from dev-python/tekore/tekore-1.0.1.ebuild rename to dev-python/tekore/tekore-1.1.0.ebuild index 64c1c557b7..f356ed9f8f 100644 --- a/dev-python/tekore/tekore-1.0.1.ebuild +++ b/dev-python/tekore/tekore-1.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_7 ) inherit distutils-r1 @@ -13,18 +13,25 @@ HOMEPAGE="https://tekore.readthedocs.io SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~amd64 ~x86 " +KEYWORDS="~amd64 ~x86" SLOT="0" -RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" - -PATCHES="${FILESDIR}/${P}-skip-sender_type-tests.patch" +RDEPEND="dev-python/requests[${PYTHON_USEDEP}] + dev-python/httpx[${PYTHON_USEDEP}]" DOCS="readme.rst" -distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-autodoc-typehints +distutils_enable_sphinx docs dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] dev-python/sphinx-autodoc-typehints[${PYTHON_USEDEP}] distutils_enable_tests pytest +python_prepare_all() { + # docs fail: AttributeError: 'PosixPath' object has no attribute 'rstrip' + sed -i -e 's:sys.path.insert(0, _root):#&:' \ + docs/conf.py || die + + distutils-r1_python_prepare_all +} + python_test() { pytest -vv tests/* || die "Tests fail with ${EPYTHON}" }