From 1fef07cb24a40678f5e1eb37dae912dc1730ce7c Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Tue, 16 Apr 2024 17:12:08 +0100 Subject: [PATCH] Replace pytest-celery with ``celery.contrib.pytest`` plugin loading The new 1.0.0 version of pytest-celery will move towards a Docker-based approach for smoke and production-like testing, bringing in a number of dependencies that we don't currently need. Since the pre-1.0.0 version of pytest-celery was just a shim for ``celery.contrib.pytest``, we can simply load the latter for API, integration and Selenium tests. --- lib/galaxy_test/conftest.py | 2 ++ pyproject.toml | 1 - test/integration/conftest.py | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/galaxy_test/conftest.py b/lib/galaxy_test/conftest.py index 64f69aee6f5..74dd381288a 100644 --- a/lib/galaxy_test/conftest.py +++ b/lib/galaxy_test/conftest.py @@ -11,6 +11,8 @@ from galaxy.web import statsd_client as statsd from galaxy_test.api._framework import ApiTestCase from galaxy_test.driver.driver_util import GalaxyTestDriver +pytest_plugins = ("celery.contrib.pytest",) + @pytest.fixture(scope="session", autouse=True) def celery_includes(): diff --git a/pyproject.toml b/pyproject.toml index 155bcbc30cd..2b24828dbe6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -143,7 +143,6 @@ pkce = "*" playwright = "*" pytest = "*" pytest-asyncio = "*" -pytest-celery = "*" pytest-cov = "*" pytest-html = "*" pytest-httpserver = "*" diff --git a/test/integration/conftest.py b/test/integration/conftest.py index 3a0619d076c..afe729466aa 100644 --- a/test/integration/conftest.py +++ b/test/integration/conftest.py @@ -2,7 +2,10 @@ import tempfile import pytest -from galaxy_test.conftest import pytest_configure # noqa: F401 +from galaxy_test.conftest import ( # noqa: F401 + pytest_configure, + pytest_plugins, +) @pytest.fixture(scope="session")