From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- dev-python/urlgrabber/Manifest | 8 +++-- .../files/urlgrabber-4.1.0-skip-test_range.patch | 11 +++++++ ...abber-4.1.0-test-mirror-set-thread-daemon.patch | 10 ++++++ dev-python/urlgrabber/metadata.xml | 1 + dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild | 26 +++++++++++++++ dev-python/urlgrabber/urlgrabber-4.0.0.ebuild | 23 -------------- dev-python/urlgrabber/urlgrabber-4.1.0.ebuild | 37 ++++++++++++++++++++++ 7 files changed, 91 insertions(+), 25 deletions(-) create mode 100644 dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch create mode 100644 dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch create mode 100644 dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild delete mode 100644 dev-python/urlgrabber/urlgrabber-4.0.0.ebuild create mode 100644 dev-python/urlgrabber/urlgrabber-4.1.0.ebuild (limited to 'dev-python/urlgrabber') diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest index 002d8184191e..50c2b35beaf7 100644 --- a/dev-python/urlgrabber/Manifest +++ b/dev-python/urlgrabber/Manifest @@ -1,3 +1,7 @@ +AUX urlgrabber-4.1.0-skip-test_range.patch 466 BLAKE2B d7035794c6beb47e7ae13e7914f5eb067e71d592b14100c04a67102c98351d020cb3949fcba79521245189c139b3eca36403ad23c2692043c20db3b4e2bad66d SHA512 f952eb16eb93b4a61826c36c8265b01d3084144dcb90aa274c3fd22ce837ef58c84a5cf7b2aae7fbbbab4048ac405b6320ba917cd6f181ccf3875bdf81f3c6be +AUX urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch 406 BLAKE2B 0b37cfa8eccf790fe0dce89f8c6cc5f9241f9c6fbf11d339cee72056387aa5444f811b3ce62e83311499effd93d954dc350b3951030b5636372b4c7b41b280f7 SHA512 208812678cc58651294b858071d3b89630f3f539036b1a4f97c5fb99314fb2889240ec9550dcf3d062bca8620049e388c47c9e57ba4beccc3c843a2f69787f77 DIST urlgrabber-4.0.0.tar.gz 86308 BLAKE2B 15195336d8e19331134b3bc1de29a669b80ab62c14e613fbcbbc1b8be8cb4ee1da3df317591989c6a3e3a403f8ad9071ca866006f23fbadc6283e88d5f050290 SHA512 01579281b1548c71737166daa6dfb7eaafceaf4afd9703f8e5e3193c33613750cb4291e3c7939065e995a173925965a16e656c43324f3b599f9c83d9e479e8c1 -EBUILD urlgrabber-4.0.0.ebuild 535 BLAKE2B 633a59ef8fee2c4c829978758c7d03ec5b5c559566a43aa1cb8fff68b675d8211df2b923dd42e3822ddd24b6ca9126ebb6d5a737ccfbc329010ca7a153c78375 SHA512 cad88565c543d06f3437006f50bfbd0067cdc3b2bd17c55da218fdd0a5d9eb7fa4100eecdfbefd01a9bcb5ea757b43a0c637dc55379e5284b9c12062f7daa190 -MISC metadata.xml 1524 BLAKE2B e00b20c0ec1de78a0b66bbe9293ec25bc3b22813f08c1d6db42e34c83d3fb26bbc977bde9baca5b7011dfa0c4fe94ca82766db569e3181341661fd9b79792e38 SHA512 387b2b964b98573902e78eb92ac214ce8ea8e98809ff63e17f0888163909a4202fbec1f9cf4d7aedfde1b0918fa521dd5db9768804553c1f25403a8261af9316 +DIST urlgrabber-4.1.0.tar.gz 277537 BLAKE2B 3697cb1d08fe0fa8bc83118e1466d76d1b8aa0375fd895d12f5135850bb5100d1d52b1691b2135a80a4937158c5d362e88777ae9ba58790ad88355f13e679b34 SHA512 43e54656d0ca92f616d49cd90dd6282408d64909848e4bf1c74b3b1eede55ba0c9526d6ea5fa9ae18545b806ef9965130ecf1cb1f5f05d4611db974d3f2aa200 +EBUILD urlgrabber-4.0.0-r1.ebuild 577 BLAKE2B ed7feb464204d7f7d8a2c471fe407367458652cf1a169f64201d37be5f7fcf38e1b13b52b641c096a575146cb62f12ea881e6a2122deac45cf685ce691504806 SHA512 bfbeb3c9ce9b8e8ccd05487db4b45b3f3ad2f8619748cd5873f8ff460888c234da76dc8d5177a71d10e967eb06a7051682713b48cc4e06eb86e5a7c2eb9accdc +EBUILD urlgrabber-4.1.0.ebuild 1105 BLAKE2B 2a4a4561259a267dc0df947596e116352781177ec2186ff22aadc5780210da4a1cff252078f4ee938c24ec8543fe97dad5612230378d80f1d42edf93dc296149 SHA512 43aa7d131fda8d971ce5b440f3d7626b76c431d22a7df87c27f8bc1b2156bbaffc3c3e4636d9180244f3019c78441b2dc1310172984e8c198a573a0776af7773 +MISC metadata.xml 1598 BLAKE2B c43f625ed8c17c5ea79b41a2b0b51ff57e7db27b28010d7e05746ba320ce844d57a250b75b9d0903b538b2610a17b848eae68fae033ad476b5f9c03e6e7e62b8 SHA512 411adc0b0da63882a68ff0a6ae0ac906cfcf568e962bf9380430f22e33b0f378ddeaad0ba535c84754c003001af321e6a0fb39e599fd1effd950d0f7ca10a068 diff --git a/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch b/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch new file mode 100644 index 000000000000..548242fc1894 --- /dev/null +++ b/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch @@ -0,0 +1,11 @@ +--- urlgrabber-urlgrabber-4-1-0/test/test_mirror.py.orig 2020-11-16 06:23:15.874354961 +0100 ++++ urlgrabber-urlgrabber-4-1-0/test/test_mirror.py 2020-11-16 06:23:59.674354944 +0100 +@@ -329,6 +329,8 @@ + self.assertEqual(self.code, 503); del self.code + + def test_range(self): ++ # skip failing test ++ self.skip() + 'test client-side processing of HTTP ranges' + # server does not process ranges + self.reply = 200, b'OK' diff --git a/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch b/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch new file mode 100644 index 000000000000..6d6e8afa6462 --- /dev/null +++ b/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch @@ -0,0 +1,10 @@ +--- urlgrabber-urlgrabber-4-1-0/test/test_mirror.py.orig 2020-11-16 18:47:43.724337579 +0100 ++++ urlgrabber-urlgrabber-4-1-0/test/test_mirror.py 2020-11-16 18:47:57.724337574 +0100 +@@ -290,6 +290,7 @@ + self.exit = False + + self.thread = threading.Thread(target=server) ++ self.thread.daemon = True + self.thread.start() + + # create grabber and mirror group objects diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml index 96c924d2a326..4713699df8c6 100644 --- a/dev-python/urlgrabber/metadata.xml +++ b/dev-python/urlgrabber/metadata.xml @@ -36,5 +36,6 @@ urlgrabber + rpm-software-management/urlgrabber diff --git a/dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild b/dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild new file mode 100644 index 000000000000..9f714bff38da --- /dev/null +++ b/dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 + +DESCRIPTION="Python module for downloading files" +HOMEPAGE="http://urlgrabber.baseurl.org" +SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86" + +RDEPEND=" + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/six[${PYTHON_USEDEP}] +" + +# Entire testsuite relies on connecting to the i'net diff --git a/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild b/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild deleted file mode 100644 index aece0892c4ca..000000000000 --- a/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="Python module for downloading files" -HOMEPAGE="http://urlgrabber.baseurl.org" -SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86" - -RDEPEND=" - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] -" - -# Entire testsuite relies on connecting to the i'net diff --git a/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild b/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild new file mode 100644 index 000000000000..aad0b5c7180f --- /dev/null +++ b/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Python module for downloading files" +HOMEPAGE="http://urlgrabber.baseurl.org https://github.com/rpm-software-management/urlgrabber" +SRC_URI="https://github.com/rpm-software-management/${PN}/archive/${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${PN}-${PV//./-}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +RESTRICT="test" + +RDEPEND=" + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] +" +BDEPEND="dev-python/six[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}/${P}-skip-test_range.patch" + "${FILESDIR}/${P}-test-mirror-set-thread-daemon.patch" +) + +python_test() { + # Entire testsuite relies on connecting to the i'net, added for reference + URLGRABBER_EXT_DOWN="${S}/scripts/urlgrabber-ext-down" \ + PYTHON_PATH="${S}" \ + "${PYTHON}" test/runtests.py -v 2 || die "tests failed under ${EPYTHON}" +} -- cgit v1.2.3