4 files changed, 70 insertions, 26 deletions
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index dbaf78314a1a..38f072da5111 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,6 +1,6 @@
 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.0.tar.gz 569320 BLAKE2B 5349f6e806c5348e584513bf8fe8828c44909b8f4e53fcdfe40e0c617f162859dbc89d4595993c29227a25cef5b6ddbb758c51c3e50b442ada62eaca0585490a SHA512 87eb83de529afe3a1e0a9f2b1727aba97482e3e55024aede29ad6e12ed5b92ca147bef8d720a09b34939c04ac5e37642147aea5b1b7686ed4b2aaacdcf998f6d
 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
+EBUILD rq-1.5.0.ebuild 1707 BLAKE2B fce5cb210014c7d1fedef4863a03395bbae186b4f11dec7dcd777a787e8c759899ec803654fbba9d34652ab2de05418ecccdd8de759c257074c7cc7f9612fa22 SHA512 35b86e12b4dde7dfb6e8e10f949ea33f2d96b2a5970f8e3e93d6a65d232b93397cc204e23058a97ebb6ec9b0ecd4a3a77d5203a569f699b6d00b781d102800c9
+EBUILD rq-1.5.1.ebuild 1707 BLAKE2B fce5cb210014c7d1fedef4863a03395bbae186b4f11dec7dcd777a787e8c759899ec803654fbba9d34652ab2de05418ecccdd8de759c257074c7cc7f9612fa22 SHA512 35b86e12b4dde7dfb6e8e10f949ea33f2d96b2a5970f8e3e93d6a65d232b93397cc204e23058a97ebb6ec9b0ecd4a3a77d5203a569f699b6d00b781d102800c9
 MISC metadata.xml 537 BLAKE2B cea9e02497c7b7bbb6201bd29fba755b56a3202e7442f3995eb33d7d7467ed8f52f6448fd351963e350bb3c7fd77ed94d3413f84a6cdaac0878d5872964b1076 SHA512 abff6d380c7da5b198297b9804e1ab8b950a051226f8f2c7bbbbc875dfe6a6efdb73f58800b21658406000280d91c401342552319e124b6fdc6c3e72d2c9cb32
diff --git a/dev-python/rq/rq-1.4.3.ebuild b/dev-python/rq/rq-1.4.3.ebuild
deleted file mode 100644
index 64bbcfda25c7..000000000000
--- a/dev-python/rq/rq-1.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.0.ebuild b/dev-python/rq/rq-1.5.0.ebuild
new file mode 100644
index 000000000000..f812fe5722f3
--- /dev/null
+++ b/dev-python/rq/rq-1.5.0.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_{6,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}"
+}
diff --git a/dev-python/rq/rq-1.5.1.ebuild b/dev-python/rq/rq-1.5.1.ebuild
index d62e57cf1504..f812fe5722f3 100644
--- a/dev-python/rq/rq-1.5.1.ebuild
+++ b/dev-python/rq/rq-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1