Merge pull request galaxyproject#20838 from nsoranzo/pytest8

Update pytest to v8

Author: mvdbeek

lib/galaxy/dependencies/dev-requirements.txt

@@ -11,6 +11,7 @@ async-timeout==5.0.1 ; python_full_version < '3.11'
 attrs==25.3.0
 axe-selenium-python==2.1.6
 babel==2.17.0
+backports-asyncio-runner==1.2.0 ; python_full_version < '3.11'
 backports-tarfile==1.2.0 ; python_full_version < '3.12' and platform_machine != 'ppc64le' and platform_machine != 's390x'
 black==25.9.0
 boto3==1.40.18
@@ -126,8 +127,8 @@ pyproject-hooks==1.2.0
 pyshacl==0.26.0 ; python_full_version < '3.10'
 pyshacl==0.30.1 ; python_full_version >= '3.10'
 pysocks==1.7.1
-pytest==7.4.4
-pytest-asyncio==0.23.8
+pytest==8.4.2
+pytest-asyncio==1.2.0
 pytest-base-url==2.1.0
 pytest-cov==7.0.0
 pytest-html==4.1.1

lib/galaxy/dependencies/pinned-test-requirements.txt

@@ -8,6 +8,7 @@ ase==3.26.0
 async-timeout==5.0.1 ; python_full_version < '3.11'
 attrs==25.3.0
 axe-selenium-python==2.1.6
+backports-asyncio-runner==1.2.0 ; python_full_version < '3.11'
 boto3==1.40.18
 botocore==1.40.18
 cachecontrol==0.14.3
@@ -94,8 +95,8 @@ pyparsing==3.2.4
 pyshacl==0.26.0 ; python_full_version < '3.10'
 pyshacl==0.30.1 ; python_full_version >= '3.10'
 pysocks==1.7.1
-pytest==7.4.4
-pytest-asyncio==0.23.8
+pytest==8.4.2
+pytest-asyncio==1.2.0
 pytest-base-url==2.1.0
 pytest-cov==7.0.0
 pytest-html==4.1.1

pyproject.toml

@@ -127,7 +127,7 @@ test = [
     "onedatafilerestclient==21.2.5.2",
     "pkce",
     "playwright>=1.48.0",  # Python 3.13 support
-    "pytest<8",  # https://github.com/galaxyproject/galaxy/issues/17561
+    "pytest",
     "pytest-asyncio",
     "pytest-cov",
     "pytest-html",

test/integration/objectstore/test_onedata_objectstore.py

@@ -28,7 +28,10 @@
 
 
 class TestOnedataObjectStoreIntegration(BaseOnedataObjectStoreIntegrationTestCase):
-    pass
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        super().handle_galaxy_config_kwds(config)
+        config["enable_celery_tasks"] = False
 
 
 instance = integration_util.integration_module_instance(TestOnedataObjectStoreIntegration)

test/integration/oidc/test_auth_oidc.py

@@ -7,7 +7,10 @@
 import tempfile
 import time
 from string import Template
-from typing import ClassVar
+from typing import (
+    ClassVar,
+    Union,
+)
 from unittest.mock import (
     _patch,
     patch,
@@ -124,7 +127,7 @@ class BaseKeycloakIntegrationTestCase(integration_util.IntegrationTestCase):
         container_name: ClassVar[str]
         backend_config_file: ClassVar[str]
         provider_name: ClassVar[str]
-        saved_oauthlib_insecure_transport: ClassVar[bool]
+        saved_env_vars: ClassVar[dict[str, Union[str, None]]]
         config_patcher: ClassVar[_patch]
 
         @classmethod
@@ -174,18 +177,21 @@ def tearDownClass(cls):
 
         @classmethod
         def disableOauthlibHttps(cls):
-            if "OAUTHLIB_INSECURE_TRANSPORT" in os.environ:
-                cls.saved_oauthlib_insecure_transport = bool(os.environ["OAUTHLIB_INSECURE_TRANSPORT"])
-            os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "true"
-            os.environ["REQUESTS_CA_BUNDLE"] = os.path.dirname(__file__) + "/keycloak-server.crt.pem"
-            os.environ["SSL_CERT_FILE"] = os.path.dirname(__file__) + "/keycloak-server.crt.pem"
+            env_vars = {
+                "OAUTHLIB_INSECURE_TRANSPORT": "true",
+                "REQUESTS_CA_BUNDLE": os.path.dirname(__file__) + "/keycloak-server.crt.pem",
+                "SSL_CERT_FILE": os.path.dirname(__file__) + "/keycloak-server.crt.pem",
+            }
+            cls.saved_env_vars = {key: os.environ.get(key) for key in env_vars}
+            os.environ.update(env_vars)
 
         @classmethod
         def restoreOauthlibHttps(cls):
-            if getattr(cls, "saved_oauthlib_insecure_transport", None):
-                os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = str(cls.saved_oauthlib_insecure_transport)
-            else:
-                del os.environ["OAUTHLIB_INSECURE_TRANSPORT"]
+            for key, value in cls.saved_env_vars.items():
+                if value is not None:
+                    os.environ[key] = value
+                else:
+                    del os.environ[key]
 
         @classmethod
         def handle_galaxy_oidc_config_kwds(cls, config):