From cccb8c21ffeb8308b87c2575d5aa75ca3feb2d77 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Mon, 28 Oct 2024 14:30:11 +0100
Subject: [PATCH] Replace all remaining occurrences of the 'local' cls by
'postgresql'
The former has been deprecated for ages...
---
swh/lister/__init__.py | 2 +-
swh/lister/cgit/tests/test_lister.py | 2 +-
swh/lister/cran/tests/test_lister.py | 2 +-
swh/lister/debian/tests/test_lister.py | 2 +-
swh/lister/gnu/tests/test_lister.py | 2 +-
swh/lister/launchpad/tests/test_lister.py | 2 +-
swh/lister/packagist/tests/test_lister.py | 2 +-
swh/lister/pypi/tests/test_lister.py | 2 +-
swh/lister/tests/test_cli.py | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/swh/lister/__init__.py b/swh/lister/__init__.py
index 28e81ef6..4d310839 100644
--- a/swh/lister/__init__.py
+++ b/swh/lister/__init__.py
@@ -77,7 +77,7 @@ def get_lister(lister_name, db_url=None, **conf):
% (lister_name, SUPPORTED_LISTERS)
)
if db_url:
- conf["lister"] = {"cls": "local", "args": {"db": db_url}}
+ conf["lister"] = {"cls": "postgresql", "db": db_url}
registry_entry = LISTERS[lister_name].load()()
lister_cls = registry_entry["lister"]
diff --git a/swh/lister/cgit/tests/test_lister.py b/swh/lister/cgit/tests/test_lister.py
index 1be417c4..37dceaca 100644
--- a/swh/lister/cgit/tests/test_lister.py
+++ b/swh/lister/cgit/tests/test_lister.py
@@ -212,7 +212,7 @@ def test_lister_cgit_instantiation_with_credentials(
def test_lister_cgit_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"url": "https://git.tizen/cgit/",
"instance": "tizen",
"credentials": {},
diff --git a/swh/lister/cran/tests/test_lister.py b/swh/lister/cran/tests/test_lister.py
index 89f9da54..db01d8c2 100644
--- a/swh/lister/cran/tests/test_lister.py
+++ b/swh/lister/cran/tests/test_lister.py
@@ -205,7 +205,7 @@ def test_lister_cran_instantiation_with_credentials(
def test_lister_cran_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"credentials": {},
}
lister = CRANLister.from_configfile()
diff --git a/swh/lister/debian/tests/test_lister.py b/swh/lister/debian/tests/test_lister.py
index b734d358..37471ec6 100644
--- a/swh/lister/debian/tests/test_lister.py
+++ b/swh/lister/debian/tests/test_lister.py
@@ -254,7 +254,7 @@ def test_lister_debian_instantiation_with_credentials(
def test_lister_debian_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"credentials": {},
}
lister = DebianLister.from_configfile()
diff --git a/swh/lister/gnu/tests/test_lister.py b/swh/lister/gnu/tests/test_lister.py
index 8cbb3b15..e731c982 100644
--- a/swh/lister/gnu/tests/test_lister.py
+++ b/swh/lister/gnu/tests/test_lister.py
@@ -28,7 +28,7 @@ def test_gnu_lister(swh_scheduler, requests_mock_datadir):
def test_gnu_lister_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"credentials": {},
}
lister = GNULister.from_configfile()
diff --git a/swh/lister/launchpad/tests/test_lister.py b/swh/lister/launchpad/tests/test_lister.py
index 50e0b43c..2bbb9ebf 100644
--- a/swh/lister/launchpad/tests/test_lister.py
+++ b/swh/lister/launchpad/tests/test_lister.py
@@ -90,7 +90,7 @@ def _check_listed_origins(scheduler_origins, launchpad_response, vcs_type="git")
def test_lister_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"credentials": {},
}
lister = LaunchpadLister.from_configfile()
diff --git a/swh/lister/packagist/tests/test_lister.py b/swh/lister/packagist/tests/test_lister.py
index 5591314d..fbb4803f 100644
--- a/swh/lister/packagist/tests/test_lister.py
+++ b/swh/lister/packagist/tests/test_lister.py
@@ -217,7 +217,7 @@ def test_packagist_lister_package_normalize_github_origin(
def test_lister_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"credentials": {},
}
lister = PackagistLister.from_configfile()
diff --git a/swh/lister/pypi/tests/test_lister.py b/swh/lister/pypi/tests/test_lister.py
index a6dac887..efd12a18 100644
--- a/swh/lister/pypi/tests/test_lister.py
+++ b/swh/lister/pypi/tests/test_lister.py
@@ -42,7 +42,7 @@ def test_lister_pypi_instantiation_with_credentials(
def test_lister_pypi_from_configfile(swh_scheduler_config, mocker):
load_from_envvar = mocker.patch("swh.lister.pattern.load_from_envvar")
load_from_envvar.return_value = {
- "scheduler": {"cls": "local", **swh_scheduler_config},
+ "scheduler": {"cls": "postgresql", **swh_scheduler_config},
"credentials": {},
}
lister = PyPILister.from_configfile()
diff --git a/swh/lister/tests/test_cli.py b/swh/lister/tests/test_cli.py
index 7329424a..b07fff20 100644
--- a/swh/lister/tests/test_cli.py
+++ b/swh/lister/tests/test_cli.py
@@ -70,7 +70,7 @@ def test_get_lister(swh_scheduler_config):
for lister_name in SUPPORTED_LISTERS:
lst = get_lister(
lister_name,
- scheduler={"cls": "local", **swh_scheduler_config},
+ scheduler={"cls": "postgresql", **swh_scheduler_config},
**lister_args.get(lister_name, {}),
)
assert hasattr(lst, "run")
--
GitLab