Merge branch 'master' into mk/remove_job_from_dependency_dependent_keys

Author: Marishka17

CHANGES.md

@@ -1,3 +1,8 @@
+### RQ 2.3.3 (2025-05-10)
+* `WorkerPool` now accepts `queue_class` argument. Thanks @amonsh1!
+* Disallow `redis-py=6.0.0`. Thanks @selwin and @terencehonles!
+* Minor typing improvements. Thanks @SpecLad!
+
 ### RQ 2.3.2 (2025-04-13)
 * Don't log job description when `log_job_description` is set to False. Thanks @danilopeixoto!
 * Fixes an issue where `pubsub_thread` may die in the background. Thanks @ankush!

SECURITY.md

@@ -0,0 +1,5 @@
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

pyproject.toml

@@ -1,55 +1,46 @@
 [build-system]
 build-backend = "hatchling.build"
-requires = [
-  "hatchling",
-]
+requires = ["hatchling"]
 
 [project]
 name = "rq"
 description = "RQ is a simple, lightweight, library for creating background jobs, and processing them."
 readme = "README.md"
 license = "BSD-2-Clause"
-maintainers = [
-  { name = "Selwin Ong" },
-]
+maintainers = [{ name = "Selwin Ong" }]
 authors = [
-  { name = "Selwin Ong", email = "[email protected]" },
-  { name = "Vincent Driessen", email = "[email protected]" },
+    { name = "Selwin Ong", email = "[email protected]" },
+    { name = "Vincent Driessen", email = "[email protected]" },
 ]
 requires-python = ">=3.8"
 classifiers = [
-  "Development Status :: 5 - Production/Stable",
-  "Intended Audience :: Developers",
-  "Intended Audience :: End Users/Desktop",
-  "Intended Audience :: Information Technology",
-  "Intended Audience :: Science/Research",
-  "Intended Audience :: System Administrators",
-  "License :: OSI Approved :: BSD License",
-  "Operating System :: MacOS",
-  "Operating System :: POSIX",
-  "Operating System :: Unix",
-  "Programming Language :: Python",
-  "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.13",
-  "Topic :: Internet",
-  "Topic :: Scientific/Engineering",
-  "Topic :: Software Development :: Libraries :: Python Modules",
-  "Topic :: System :: Distributed Computing",
-  "Topic :: System :: Monitoring",
-  "Topic :: System :: Systems Administration",
-]
-dynamic = [
-  "version",
-]
-dependencies = [
-  "click>=5",
-  "redis>=3.5",
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Intended Audience :: End Users/Desktop",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: System Administrators",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX",
+    "Operating System :: Unix",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Internet",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: System :: Distributed Computing",
+    "Topic :: System :: Monitoring",
+    "Topic :: System :: Systems Administration",
 ]
+dynamic = ["version"]
+dependencies = ["click>=5", "redis>=3.5,!=6.0.0"]
 urls.changelog = "https://github.com/rq/rq/blob/master/CHANGES.md"
 urls.documentation = "https://python-rq.org/docs/"
 urls.homepage = "https://python-rq.org/"
@@ -60,48 +51,48 @@ scripts.rqworker = "rq.cli:worker" # TODO [v2]: Remove
 
 [dependency-groups]
 dev = [
-  "coverage>=7.6.1",
-  "mypy>=1.14.1",
-  "packaging>=24.2",
-  "psutil>=7",
-  "pytest>=8.3.5",
-  "pytest-cov>=5",
-  "ruff>=0.9.9",
-  "tox>=4.24.1",
-  "types-greenlet>=3.1.0.20241221",
-  "types-redis>=4.6.0.20241004",
+    "coverage>=7.6.1",
+    "mypy>=1.14.1",
+    "packaging>=24.2",
+    "psutil>=7",
+    "pytest>=8.3.5",
+    "pytest-cov>=5",
+    "ruff>=0.9.9",
+    "tox>=4.24.1",
+    "types-greenlet>=3.1.0.20241221",
+    "types-redis>=4.6.0.20241004",
 ]
 
 [tool.hatch.version]
 path = "rq/version.py"
 
 [tool.hatch.build.targets.sdist]
 include = [
-  "/docs",
-  "/rq",
-  "/tests",
-  "CHANGES.md",
-  "LICENSE",
-  "pyproject.toml",
-  "README.md",
-  "requirements.txt",
-  "tox.ini",
+    "/docs",
+    "/rq",
+    "/tests",
+    "CHANGES.md",
+    "LICENSE",
+    "pyproject.toml",
+    "README.md",
+    "requirements.txt",
+    "tox.ini",
 ]
 [tool.hatch.envs.default]
 installer = "uv"
 
 [tool.hatch.envs.test]
 dependencies = [
-  "coverage",
-  "mypy",
-  "packaging",
-  "psutil",
-  "pytest",
-  "pytest-cov",
-  "ruff",
-  "tox",
-  "types-greenlet",
-  "types-redis",
+    "coverage",
+    "mypy",
+    "packaging",
+    "psutil",
+    "pytest",
+    "pytest-cov",
+    "ruff",
+    "tox",
+    "types-greenlet",
+    "types-redis",
 ]
 [tool.hatch.envs.test.scripts]
 cov = "pytest --cov=rq --cov-config=.coveragerc --cov-report=xml {args:tests}"
@@ -115,13 +106,19 @@ target-version = "py38"
 line-length = 120
 format.quote-style = "single"
 lint.select = [
-  "E", # pycodestyle errors
-  "F", # pyflakes errors
-  "I", # import sorting
-  "W", # pycodestyle warnings
+    "E", # pycodestyle errors
+    "F", # pyflakes errors
+    "I", # import sorting
+    "W", # pycodestyle warnings
+]
+lint.isort.known-first-party = ["rq"]
+lint.isort.section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "first-party",
+    "local-folder",
 ]
-lint.isort.known-first-party = [ "rq" ]
-lint.isort.section-order = [ "future", "standard-library", "third-party", "first-party", "local-folder" ]
 
 [tool.mypy]
 allow_redefinition = true

rq/queue.py

@@ -757,7 +757,7 @@ def prepare_data(
         ttl: Optional[int] = None,
         failure_ttl: Optional[int] = None,
         description: Optional[str] = None,
-        depends_on: Optional[List] = None,
+        depends_on: Optional['JobDependencyType'] = None,
         job_id: Optional[str] = None,
         at_front: bool = False,
         meta: Optional[Dict] = None,

rq/version.py

@@ -1 +1 @@
-VERSION = '2.3.2'
+VERSION = '2.3.3'

rq/worker.py

@@ -1728,7 +1728,12 @@ def fork_work_horse(self, job: 'Job', queue: 'Queue'):
         """Spawns a work horse to perform the actual work using os.spawn()."""
         os.environ['RQ_WORKER_ID'] = self.name
         os.environ['RQ_JOB_ID'] = job.id
-        connection_kwargs = {k: v for k, v in self.connection.connection_pool.connection_kwargs.items() if k != 'retry'}
+
+        redis_kwargs = self.connection.connection_pool.connection_kwargs
+        if redis_kwargs.get('retry'):
+            # Remove retry from connection kwargs to avoid issues with os.spawnv
+            del redis_kwargs['retry']
+
         child_pid = os.spawnv(
             os.P_NOWAIT,
             sys.executable,
@@ -1743,7 +1748,7 @@ def fork_work_horse(self, job: 'Job', queue: 'Queue'):
 from rq.job import Job
 
 # Recreate worker instance
-redis = Redis(**{connection_kwargs})
+redis = Redis(**{redis_kwargs})
 worker = Worker.find_by_key("{self.key}", connection=redis)
 if not worker:
     sys.exit(1)

rq/worker_pool.py

@@ -47,6 +47,7 @@ def __init__(
         worker_class: Type[BaseWorker] = Worker,
         serializer: Type['Serializer'] = DefaultSerializer,
         job_class: Type[Job] = Job,
+        queue_class: Type[Queue] = Queue,
         *args,
         **kwargs,
     ):
@@ -64,6 +65,7 @@ def __init__(
         self.worker_class: Type[BaseWorker] = worker_class
         self.serializer: Type['Serializer'] = serializer
         self.job_class: Type[Job] = job_class
+        self.queue_class: Type[Queue] = queue_class
 
         # A dictionary of WorkerData keyed by worker name
         self.worker_dict: Dict[str, WorkerData] = {}
@@ -72,7 +74,7 @@ def __init__(
     @property
     def queues(self) -> List[Queue]:
         """Returns a list of Queue objects"""
-        return [Queue(name, connection=self.connection) for name in self._queue_names]
+        return [self.queue_class(name, connection=self.connection) for name in self._queue_names]
 
     @property
     def number_of_active_workers(self) -> int:
@@ -251,15 +253,23 @@ def run_worker(
     worker_class: Type[BaseWorker] = Worker,
     serializer: Type['Serializer'] = DefaultSerializer,
     job_class: Type[Job] = Job,
+    queue_class: Type[Queue] = Queue,
     burst: bool = True,
     logging_level: str = 'INFO',
     _sleep: int = 0,
 ):
     connection = connection_class(
         connection_pool=ConnectionPool(connection_class=connection_pool_class, **connection_pool_kwargs)
     )
-    queues = [Queue(name, connection=connection) for name in queue_names]
-    worker = worker_class(queues, name=worker_name, connection=connection, serializer=serializer, job_class=job_class)
+    queues = [queue_class(name, connection=connection) for name in queue_names]
+    worker = worker_class(
+        queues,
+        name=worker_name,
+        connection=connection,
+        serializer=serializer,
+        job_class=job_class,
+        queue_class=queue_class,
+    )
     worker.log.info('Starting worker started with PID %s', os.getpid())
     time.sleep(_sleep)
     worker.work(burst=burst, with_scheduler=True, logging_level=logging_level)

tests/test_spawn_worker.py

@@ -106,7 +106,7 @@ def test_working_worker_cold_shutdown(self):
 
         sentinel_file = '/tmp/.rq_sentinel_cold'
         self.assertFalse(
-            os.path.exists(sentinel_file), '{sentinel_file} file should not exist yet, delete that file and try again.'
+            os.path.exists(sentinel_file), f'{sentinel_file} file should not exist yet, delete that file and try again.'
         )
         fooq.enqueue(create_file_after_timeout, sentinel_file, 5)
         self.assertFalse(w._stop_requested)

tests/test_worker.py

@@ -1423,7 +1423,7 @@ def test_working_worker_cold_shutdown(self):
 
         sentinel_file = '/tmp/.rq_sentinel_cold'
         self.assertFalse(
-            os.path.exists(sentinel_file), '{sentinel_file} file should not exist yet, delete that file and try again.'
+            os.path.exists(sentinel_file), f'{sentinel_file} file should not exist yet, delete that file and try again.'
         )
         fooq.enqueue(create_file_after_timeout, sentinel_file, 5)
         self.assertFalse(w._stop_requested)
@@ -1442,7 +1442,7 @@ def test_working_worker_cold_shutdown(self):
 
     @slow
     def test_work_horse_death_sets_job_failed(self):
-        """worker with an ongoing job whose work horse dies unexpectadly (before
+        """worker with an ongoing job whose work horse dies unexpectedly (before
         completing the job) should set the job's status to FAILED
         """
         fooq = Queue('foo', connection=self.connection)

tox.ini

@@ -52,3 +52,6 @@ deps=
 passenv=
     RUN_SSL_TESTS
 commands=pytest -m ssl_test {posargs}
+
+[pytest]
+filterwarnings = ignore::pytest.PytestUnhandledThreadExceptionWarning