Page MenuHomeSoftware Heritage
Files F7066116

D3458.id12236.diff
No OneTemporary
Actions

D3458.id12236.diff
View Options

diff --git a/mypy.ini b/mypy.ini
--- a/mypy.ini
+++ b/mypy.ini
@@ -27,6 +27,9 @@
[mypy-pytest.*]
ignore_missing_imports = True
+[tenacity.*]
+ignore_missing_imports = True
+
[mypy-rest_framework.*]
ignore_missing_imports = True
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -48,12 +48,12 @@
packages=find_packages(),
install_requires=parse_requirements(None, "swh"),
tests_require=parse_requirements("test"),
- setup_requires=["vcversioner"],
+ setup_requires=["setuptools-scm"],
+ use_scm_version=True,
extras_require={
"testing": parse_requirements("test", "server", "swh-server"),
"server": parse_requirements("server", "swh-server"),
},
- vcversioner={},
include_package_data=True,
entry_points="""
[console_scripts]
diff --git a/swh/deposit/tests/api/conftest.py b/swh/deposit/tests/api/conftest.py
--- a/swh/deposit/tests/api/conftest.py
+++ b/swh/deposit/tests/api/conftest.py
@@ -1,8 +1,9 @@
-# Copyright (C) 2019 The Software Heritage developers
+# Copyright (C) 2019-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
import hashlib
import pytest
@@ -19,6 +20,12 @@
from swh.deposit.api.private.deposit_check import SWHChecksDeposit
+@pytest.fixture
+def datadir(request):
+ """Override default datadir to target main test datadir"""
+ return os.path.join(os.path.dirname(str(request.fspath)), "../data")
+
+
@pytest.fixture
def ready_deposit_ok(partial_deposit_with_metadata):
"""Returns a deposit ready for checks (it will pass the checks).
diff --git a/swh/deposit/tests/api/data/atom b/swh/deposit/tests/api/data/atom
deleted file mode 120000
--- a/swh/deposit/tests/api/data/atom
+++ /dev/null
@@ -1 +0,0 @@
-../../data/atom
\ No newline at end of file
diff --git a/swh/deposit/tests/cli/data/atom b/swh/deposit/tests/cli/data/atom
deleted file mode 120000
--- a/swh/deposit/tests/cli/data/atom
+++ /dev/null
@@ -1 +0,0 @@
-../../data/atom
\ No newline at end of file
diff --git a/swh/deposit/tests/cli/test_client.py b/swh/deposit/tests/cli/test_client.py
--- a/swh/deposit/tests/cli/test_client.py
+++ b/swh/deposit/tests/cli/test_client.py
@@ -23,6 +23,12 @@
}
+@pytest.fixture
+def datadir(request):
+ """Override default datadir to target main test datadir"""
+ return os.path.join(os.path.dirname(str(request.fspath)), "../data")
+
+
@pytest.fixture
def slug():
return generate_slug()

File Metadata

Mime Type
text/plain
Expires
Nov 4 2024, 4:38 PM (19 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3221083

Event Timeline

About · Developer information · Legal