From b5cecff6df1412ebd83727065f0ca310f9cc7f5f Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Fri, 16 Oct 2020 15:50:06 +0200
Subject: [PATCH] vault.config: Adapt scheduler configuration structure
---
requirements-swh.txt | 2 +-
swh/vault/api/server.py | 5 +----
swh/vault/tests/conftest.py | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/requirements-swh.txt b/requirements-swh.txt
index f1b77b7..d9966ae 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,5 +1,5 @@
swh.core[db,http] >= 0.3
swh.model >= 0.3
swh.objstorage >= 0.0.17
-swh.scheduler >= 0.0.39
+swh.scheduler >= 0.7.0
swh.storage >= 0.0.106
diff --git a/swh/vault/api/server.py b/swh/vault/api/server.py
index 8837fa2..6c178e0 100644
--- a/swh/vault/api/server.py
+++ b/swh/vault/api/server.py
@@ -32,10 +32,7 @@ DEFAULT_CONFIG = {
"dict",
{"cls": "local", "args": {"db": "dbname=softwareheritage-vault-dev",},},
),
- "scheduler": (
- "dict",
- {"cls": "remote", "args": {"url": "http://localhost:5008/",}},
- ),
+ "scheduler": ("dict", {"cls": "remote", "url": "http://localhost:5008/",},),
}
diff --git a/swh/vault/tests/conftest.py b/swh/vault/tests/conftest.py
index bbdb652..9090e46 100644
--- a/swh/vault/tests/conftest.py
+++ b/swh/vault/tests/conftest.py
@@ -77,7 +77,7 @@ def swh_vault(request, postgresql_proc, postgresql, postgresql2, tmp_path):
"allow_delete": True,
},
},
- "scheduler": {"cls": "remote", "args": {"url": "http://swh-scheduler:5008",},},
+ "scheduler": {"cls": "remote", "url": "http://swh-scheduler:5008",},
}
return get_vault("local", vault_config)
--
GitLab