diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -111,13 +111,11 @@ ``` storage: cls: local - args: - db: "dbname=softwareheritage-dev user= password=" - objstorage: - cls: pathslicing - args: - root: /tmp/swh-storage/ - slicing: 0:2/2:4/4:6 + db: "dbname=softwareheritage-dev user= password=" + objstorage: + cls: pathslicing + root: /tmp/swh-storage/ + slicing: 0:2/2:4/4:6 ``` which means, this uses: @@ -175,8 +173,7 @@ ``` storage: cls: remote - args: - url: http://localhost:5002/ + url: http://localhost:5002/ ``` You could directly define a local storage with the following snippet: @@ -184,11 +181,9 @@ ``` storage: cls: local - args: - db: service=swh-dev - objstorage: - cls: pathslicing - args: - root: /home/storage/swh-storage/ - slicing: 0:2/2:4/4:6 + db: service=swh-dev + objstorage: + cls: pathslicing + root: /home/storage/swh-storage/ + slicing: 0:2/2:4/4:6 ``` diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,3 +1,3 @@ swh.core[db,http] >= 0.3 swh.model >= 0.6.6 -swh.objstorage >= 0.0.40 +swh.objstorage >= 0.2.2 diff --git a/swh/storage/in_memory.py b/swh/storage/in_memory.py --- a/swh/storage/in_memory.py +++ b/swh/storage/in_memory.py @@ -620,7 +620,7 @@ def reset(self): self._cql_runner = InMemoryCqlRunner() - self.objstorage = ObjStorage({"cls": "memory", "args": {}}) + self.objstorage = ObjStorage({"cls": "memory"}) def check_config(self, *, check_write: bool) -> bool: return True diff --git a/swh/storage/pytest_plugin.py b/swh/storage/pytest_plugin.py --- a/swh/storage/pytest_plugin.py +++ b/swh/storage/pytest_plugin.py @@ -81,7 +81,7 @@ yield { "cls": "local", "db": swh_storage_postgresql.dsn, - "objstorage": {"cls": "memory", "args": {}}, + "objstorage": {"cls": "memory"}, "check_config": {"check_write": True}, } diff --git a/swh/storage/tests/test_cassandra.py b/swh/storage/tests/test_cassandra.py --- a/swh/storage/tests/test_cassandra.py +++ b/swh/storage/tests/test_cassandra.py @@ -169,8 +169,8 @@ hosts=hosts, port=port, keyspace=keyspace, - journal_writer={"cls": "memory",}, - objstorage={"cls": "memory", "args": {},}, + journal_writer={"cls": "memory"}, + objstorage={"cls": "memory"}, ) yield storage_config diff --git a/swh/storage/tests/test_init.py b/swh/storage/tests/test_init.py --- a/swh/storage/tests/test_init.py +++ b/swh/storage/tests/test_init.py @@ -24,7 +24,7 @@ ( "local", DbStorage, - {"db": "postgresql://db", "objstorage": {"cls": "memory", "args": {}}}, + {"db": "postgresql://db", "objstorage": {"cls": "memory"}}, ), ("filter", FilteringProxyStorage, {"storage": {"cls": "memory"}}), ("buffer", BufferingProxyStorage, {"storage": {"cls": "memory"}}), @@ -64,7 +64,7 @@ """ with pytest.raises(ValueError, match="Unknown storage class `unknown`"): - get_storage("unknown", args=[]) + get_storage("unknown") def test_get_storage_pipeline(): @@ -123,11 +123,7 @@ mock_pool.ThreadedConnectionPool.return_value = None check_backend_check_config( monkeypatch, - { - "cls": "local", - "db": "postgresql://db", - "objstorage": {"cls": "memory", "args": {}}, - }, + {"cls": "local", "db": "postgresql://db", "objstorage": {"cls": "memory"}}, backend_storage_cls=DbStorage, )