Merge branch 'develop-1.9' into postgis-migrations

# Conflicts: # integration_tests/conftest.py
opendatacube · Dec 6, 2023 · ede3cd8 · ede3cd8
2 parents 9839159 + 5be0e6e
commit ede3cd8
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/integration_tests/conftest.py b/integration_tests/conftest.py
@@ -440,8 +440,14 @@ def datacube_env_name_pair(request) -> tuple[str, str]:
 
 
 @pytest.fixture
-def odc_config() -> ODCConfig:
-    return ODCConfig(paths=CONFIG_FILE_PATHS)
+def local_config(datacube_env_name):
+    """Provides a :class:`LocalConfig` configured with suitable config file paths.
+
+    .. seealso::
+
+        The :func:`integration_config_paths` fixture sets up the config files.
+    """
+    return LocalConfig.find(CONFIG_FILE_PATHS, env=datacube_env_name)
 
 
 @pytest.fixture