Page MenuHomeSoftware Heritage
Files F9696893

No OneTemporary
Actions

View Options

diff --git a/PKG-INFO b/PKG-INFO
index 82ecede..bc3f006 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,31 +1,31 @@
Metadata-Version: 2.1
Name: swh.vault
-Version: 0.3.4
+Version: 0.4.0
Summary: Software Heritage vault
Home-page: https://forge.softwareheritage.org/diffusion/DVAU/
Author: Software Heritage developers
Author-email: swh-devel@inria.fr
License: UNKNOWN
Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest
Project-URL: Funding, https://www.softwareheritage.org/donate
Project-URL: Source, https://forge.softwareheritage.org/source/swh-vault
Project-URL: Documentation, https://docs.softwareheritage.org/devel/swh-vault/
Description: swh-vault
=========
User-facing service that allows to retrieve parts of the archive as
self-contained bundles.
See the
[documentation](https://docs.softwareheritage.org/devel/swh-vault/index.html)
for more details.
Platform: UNKNOWN
Classifier: Programming Language :: Python :: 3
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
Classifier: Operating System :: OS Independent
Classifier: Development Status :: 5 - Production/Stable
Requires-Python: >=3.7
Description-Content-Type: text/markdown
Provides-Extra: testing
diff --git a/requirements-test.txt b/requirements-test.txt
index fed1464..c32d259 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,7 +1,6 @@
pytest
-pytest-postgresql
dulwich >= 0.18.7
swh.loader.core
swh.loader.git >= 0.0.52
swh.storage[testing]
pytest-mock
diff --git a/swh.vault.egg-info/PKG-INFO b/swh.vault.egg-info/PKG-INFO
index 82ecede..bc3f006 100644
--- a/swh.vault.egg-info/PKG-INFO
+++ b/swh.vault.egg-info/PKG-INFO
@@ -1,31 +1,31 @@
Metadata-Version: 2.1
Name: swh.vault
-Version: 0.3.4
+Version: 0.4.0
Summary: Software Heritage vault
Home-page: https://forge.softwareheritage.org/diffusion/DVAU/
Author: Software Heritage developers
Author-email: swh-devel@inria.fr
License: UNKNOWN
Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest
Project-URL: Funding, https://www.softwareheritage.org/donate
Project-URL: Source, https://forge.softwareheritage.org/source/swh-vault
Project-URL: Documentation, https://docs.softwareheritage.org/devel/swh-vault/
Description: swh-vault
=========
User-facing service that allows to retrieve parts of the archive as
self-contained bundles.
See the
[documentation](https://docs.softwareheritage.org/devel/swh-vault/index.html)
for more details.
Platform: UNKNOWN
Classifier: Programming Language :: Python :: 3
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
Classifier: Operating System :: OS Independent
Classifier: Development Status :: 5 - Production/Stable
Requires-Python: >=3.7
Description-Content-Type: text/markdown
Provides-Extra: testing
diff --git a/swh.vault.egg-info/requires.txt b/swh.vault.egg-info/requires.txt
index 0ac954a..f4f1db4 100644
--- a/swh.vault.egg-info/requires.txt
+++ b/swh.vault.egg-info/requires.txt
@@ -1,20 +1,19 @@
click
flask
psycopg2
python-dateutil
fastimport
typing-extensions
swh.core[db,http]>=0.5
swh.model>=0.3
swh.objstorage>=0.0.17
swh.scheduler>=0.7.0
swh.storage>=0.0.106
[testing]
pytest
-pytest-postgresql
dulwich>=0.18.7
swh.loader.core
swh.loader.git>=0.0.52
swh.storage[testing]
pytest-mock
diff --git a/swh/vault/tests/conftest.py b/swh/vault/tests/conftest.py
index 67e531f..a5356c2 100644
--- a/swh/vault/tests/conftest.py
+++ b/swh/vault/tests/conftest.py
@@ -1,97 +1,88 @@
# Copyright (C) 2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
import os
from typing import Any, Dict
import pkg_resources.extern.packaging.version
import pytest
import yaml
from swh.core.db.pytest_plugin import postgresql_fact
from swh.storage.tests import SQL_DIR as STORAGE_SQL_DIR
import swh.vault
from swh.vault import get_vault
os.environ["LC_ALL"] = "C.UTF-8"
pytest_v = pkg_resources.get_distribution("pytest").parsed_version
if pytest_v < pkg_resources.extern.packaging.version.parse("3.9"):
@pytest.fixture
def tmp_path():
import pathlib
import tempfile
with tempfile.TemporaryDirectory() as tmpdir:
yield pathlib.Path(tmpdir)
-def db_url(name, postgresql_proc):
- return "postgresql://{user}@{host}:{port}/{dbname}".format(
- host=postgresql_proc.host,
- port=postgresql_proc.port,
- user="postgres",
- dbname=name,
- )
-
-
VAULT_SQL_DIR = os.path.join(os.path.dirname(swh.vault.__file__), "sql")
postgres_vault = postgresql_fact(
"postgresql_proc", db_name="vault", dump_files=f"{VAULT_SQL_DIR}/*.sql"
)
postgres_storage = postgresql_fact(
"postgresql_proc", db_name="storage", dump_files=f"{STORAGE_SQL_DIR}/*.sql"
)
@pytest.fixture
def swh_vault_config(postgres_vault, postgres_storage, tmp_path) -> Dict[str, Any]:
tmp_path = str(tmp_path)
return {
"db": postgres_vault.dsn,
"storage": {
"cls": "local",
"db": postgres_storage.dsn,
"objstorage": {
"cls": "pathslicing",
"args": {"root": tmp_path, "slicing": "0:1/1:5",},
},
},
"cache": {
"cls": "pathslicing",
"args": {"root": tmp_path, "slicing": "0:1/1:5", "allow_delete": True},
},
"scheduler": {"cls": "remote", "url": "http://swh-scheduler:5008",},
}
@pytest.fixture
def swh_local_vault_config(swh_vault_config: Dict[str, Any]) -> Dict[str, Any]:
return {
"vault": {"cls": "local", **swh_vault_config},
"client_max_size": 1024 ** 3,
}
@pytest.fixture
def swh_vault_config_file(swh_local_vault_config, monkeypatch, tmp_path):
conf_path = os.path.join(str(tmp_path), "vault-server.yml")
with open(conf_path, "w") as f:
f.write(yaml.dump(swh_local_vault_config))
monkeypatch.setenv("SWH_CONFIG_FILENAME", conf_path)
return conf_path
@pytest.fixture
def swh_vault(swh_vault_config):
return get_vault("local", **swh_vault_config)
@pytest.fixture
def swh_storage(swh_vault):
return swh_vault.storage

File Metadata

Mime Type
text/x-diff
Expires
Mon, Aug 18, 10:02 PM (23 h, 31 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3322056

Event Timeline

About · Developer information · Legal