gentoo resync : 25.08.2020

6 files changed, 115 insertions, 22 deletions

diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index b7f6609de5fd..dbaf78314a1a 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,6 @@
-DIST rq-1.3.0.tar.gz 50906 BLAKE2B 073ef65c90b2f4cab7505148133cf9e8652f6915bcb34d96b61fca2eb3096d5eb8fb506dfa3d22f402d4ef7ff8e5456faa3bdf7ad6586cfa563b7b2c2da8cb95 SHA512 3c7c3b63a7068ada14c39fa21631fa35d336955c8f5b7b5fbf3d75a99b046abacc2ff28a3a58fc03d587be8bf8e22eea33d31142d3be880afc49287a004ff782
-EBUILD rq-1.3.0.ebuild 508 BLAKE2B de1a062875be664905085bab9e3674bfb07e4c3fda9186d320216d7e822836aec14e155fc24ccaaec0ddbd0dbeb66c8c23eae82a2b20cacf50fa316a95449d92 SHA512 22e8a7d5f3550c867499cea2419e0a57e479f63675f75c517cb629353cbb9c1117b6e177473848cc6ff54c58f47e853bb2903ca17dad9070203a887f37639372
-MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
+AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd175cb375643f85d91754a651fc012d12db32c8875b8f8236407672aaa787aef1e4484a4e33b9582c65aad00c525a7180 SHA512 373b94f956aded0d54ecaa04250533f564f3a8e81d693353c4ce63dfd754f013e741084faaed976ae9b0aca4c0f2a21cf70f2118820f157282966a8446f7c1e8
+DIST rq-1.4.3.tar.gz 52258 BLAKE2B fd2bb19239ac3011005b34cf041e7736794a27b2097a7ff1808a716d45ad224ad349e316f172308175174f59ff0d3d2bbe0c6778bd66cdad6755da2740898c0d SHA512 177c748148a109efaeddf14b3847e7980882f385ba0e346ccfa72983d584f1c739417383c6eec83370a66f1ceeb5f955de9d5ccf87e4136074aa52e2f9144bd3
+DIST rq-1.5.1.tar.gz 569967 BLAKE2B 9de43fa2d88a58186e8889163f4c1ea92da068c3652c5e32008a39c0e3b27e06f4a1c696a88d1dbf5b05d280bff9c1c56a1995673e9d0ff3fb3a50498729e96b SHA512 2a03b79c7f1b253e2974007616ad3342e0b98ef9f57b0ca9dd41ecb4319074cec3ae4ba5f8958f54a1c2a6342062d74a33ec6d03689f3a89074854483af74b4f
+EBUILD rq-1.4.3.ebuild 590 BLAKE2B da2d1cb2e88e755f6a5feb62a6183e0cb9368d81de90b028c28d8d3bff4650b3b98bd04a0203e555ddc17276a1d27291a04ffcad9590da5867951d49978dbfe0 SHA512 777bf196a20ad2266bbdedc1b37a6176c07e25a6e0defe08fd693b8ab5fa4ab599fb40b81414138bad6b7004bb4dfac5d6dad55954f196bd7d382b4827568a76
+EBUILD rq-1.5.1.ebuild 1705 BLAKE2B b44f5c73f0ac7fd44508e033a53e73969e96ac47d3ed18925fa48b9436455fc58dcd5997f64ec77d2645bed8925ba1557269e8d91aab5e0d819db3876126d34b SHA512 962f1f6d4ef16b9fa0f0a13657e8f7ecf430cfec7c67a16b6004f55a75c209993a74cf4fb061444a647f04b1ac8e97aa4566e5d36739a2cecdc43eaea2b5f3b8
+MISC metadata.xml 537 BLAKE2B cea9e02497c7b7bbb6201bd29fba755b56a3202e7442f3995eb33d7d7467ed8f52f6448fd351963e350bb3c7fd77ed94d3413f84a6cdaac0878d5872964b1076 SHA512 abff6d380c7da5b198297b9804e1ab8b950a051226f8f2c7bbbbc875dfe6a6efdb73f58800b21658406000280d91c401342552319e124b6fdc6c3e72d2c9cb32
diff --git a/dev-python/rq/files/rq-1.5.0-no-install-tests.patch b/dev-python/rq/files/rq-1.5.0-no-install-tests.patch
new file mode 100644
index 000000000000..0c7aa7aacc4c
--- /dev/null
+++ b/dev-python/rq/files/rq-1.5.0-no-install-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index ac40818..b67b25c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,7 +36,7 @@ setup(
+     description='RQ is a simple, lightweight, library for creating background '
+                 'jobs, and processing them.',
+     long_description=__doc__,
+-    packages=find_packages(exclude=['tests']),
++    packages=find_packages(exclude=['tests*']),
+     include_package_data=True,
+     zip_safe=False,
+     platforms='any',
diff --git a/dev-python/rq/metadata.xml b/dev-python/rq/metadata.xml
index 5d3d9dc0e2ac..87176f9df319 100644
--- a/dev-python/rq/metadata.xml
+++ b/dev-python/rq/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
@@ -8,4 +12,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rq/rq</remote-id>
+		<remote-id type="pypi">rq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rq/rq-1.3.0.ebuild b/dev-python/rq/rq-1.3.0.ebuild
deleted file mode 100644
index 8fe00a9e7b89..000000000000
--- a/dev-python/rq/rq-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://github.com/rq/rq"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=" >=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/rq/rq-1.4.3.ebuild b/dev-python/rq/rq-1.4.3.ebuild
new file mode 100644
index 000000000000..64bbcfda25c7
--- /dev/null
+++ b/dev-python/rq/rq-1.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/rq/rq-1.5.1.ebuild b/dev-python/rq/rq-1.5.1.ebuild
new file mode 100644
index 000000000000..d62e57cf1504
--- /dev/null
+++ b/dev-python/rq/rq-1.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-no-install-tests.patch"
+)
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+python_test() {
+	# Tests needing rqworker:
+	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
+	distutils_install_for_testing
+	PATH="${BUILD_DIR}/test/scripts/:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
+}