Page MenuHomeSoftware Heritage
Files F9124656

D6414.diff
No OneTemporary
Actions

D6414.diff
View Options

diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,3 +1,3 @@
swh.core >= 0.10.0
-swh.model >= 0.7.0
+swh.model >= 3.0.0
swh.web.client >= 0.2.5
diff --git a/swh/fuse/cache.py b/swh/fuse/cache.py
--- a/swh/fuse/cache.py
+++ b/swh/fuse/cache.py
@@ -23,7 +23,7 @@
from swh.fuse.fs.entry import FuseDirEntry, FuseEntry
from swh.fuse.fs.mountpoint import CacheDir, OriginDir
from swh.model.exceptions import ValidationError
-from swh.model.identifiers import CoreSWHID, ObjectType
+from swh.model.swhids import CoreSWHID, ObjectType
from swh.web.client.client import ORIGIN_VISIT, typify_json
diff --git a/swh/fuse/fs/artifact.py b/swh/fuse/fs/artifact.py
--- a/swh/fuse/fs/artifact.py
+++ b/swh/fuse/fs/artifact.py
@@ -21,7 +21,7 @@
)
from swh.model.from_disk import DentryPerms
from swh.model.hashutil import hash_to_bytes, hash_to_hex
-from swh.model.identifiers import CoreSWHID, ObjectType
+from swh.model.swhids import CoreSWHID, ObjectType
SWHID_REGEXP = r"swh:1:(cnt|dir|rel|rev|snp):[0-9a-f]{40}"
diff --git a/swh/fuse/fs/mountpoint.py b/swh/fuse/fs/mountpoint.py
--- a/swh/fuse/fs/mountpoint.py
+++ b/swh/fuse/fs/mountpoint.py
@@ -19,7 +19,7 @@
)
from swh.model.exceptions import ValidationError
from swh.model.hashutil import hash_to_hex
-from swh.model.identifiers import CoreSWHID, ObjectType
+from swh.model.swhids import CoreSWHID, ObjectType
JSON_SUFFIX = ".json"
diff --git a/swh/fuse/fuse.py b/swh/fuse/fuse.py
--- a/swh/fuse/fuse.py
+++ b/swh/fuse/fuse.py
@@ -21,7 +21,7 @@
from swh.fuse.cache import FuseCache
from swh.fuse.fs.entry import FuseDirEntry, FuseEntry, FuseFileEntry, FuseSymlinkEntry
from swh.fuse.fs.mountpoint import Root
-from swh.model.identifiers import CoreSWHID, ObjectType
+from swh.model.swhids import CoreSWHID, ObjectType
from swh.web.client.client import WebAPIClient
diff --git a/swh/fuse/tests/api_url.py b/swh/fuse/tests/api_url.py
--- a/swh/fuse/tests/api_url.py
+++ b/swh/fuse/tests/api_url.py
@@ -7,7 +7,7 @@
from typing import Union
from swh.model.hashutil import hash_to_hex
-from swh.model.identifiers import CoreSWHID, ObjectType
+from swh.model.swhids import CoreSWHID, ObjectType
GRAPH_API_REQUEST = Enum("GRAPH_API_REQUEST", "HISTORY")
diff --git a/swh/fuse/tests/data/gen-api-data.py b/swh/fuse/tests/data/gen-api-data.py
--- a/swh/fuse/tests/data/gen-api-data.py
+++ b/swh/fuse/tests/data/gen-api-data.py
@@ -24,7 +24,7 @@
REV_SMALL_HISTORY,
)
from swh.model.hashutil import hash_to_bytes
-from swh.model.identifiers import CoreSWHID, ObjectType
+from swh.model.swhids import CoreSWHID, ObjectType
API_URL_real = "https://archive.softwareheritage.org/api/1"
API_URL_test = "https://invalid-test-only.archive.softwareheritage.org/api/1"
diff --git a/swh/fuse/tests/test_cache.py b/swh/fuse/tests/test_cache.py
--- a/swh/fuse/tests/test_cache.py
+++ b/swh/fuse/tests/test_cache.py
@@ -7,7 +7,7 @@
from swh.fuse.tests.data.config import REGULAR_FILE
from swh.model.hashutil import hash_to_hex
-from swh.model.identifiers import CoreSWHID
+from swh.model.swhids import CoreSWHID
def test_cache_artifact(fuse_mntdir):
diff --git a/swh/fuse/tests/test_mountpoint.py b/swh/fuse/tests/test_mountpoint.py
--- a/swh/fuse/tests/test_mountpoint.py
+++ b/swh/fuse/tests/test_mountpoint.py
@@ -6,7 +6,7 @@
import os
from swh.fuse.tests.data.config import ORIGIN_URL_ENCODED, REGULAR_FILE
-from swh.model.identifiers import CoreSWHID
+from swh.model.swhids import CoreSWHID
def test_mountpoint(fuse_mntdir):
diff --git a/swh/fuse/tests/test_revision.py b/swh/fuse/tests/test_revision.py
--- a/swh/fuse/tests/test_revision.py
+++ b/swh/fuse/tests/test_revision.py
@@ -13,7 +13,7 @@
)
from swh.fuse.tests.data.config import REV_SMALL_HISTORY, ROOT_DIR, ROOT_REV
from swh.model.hashutil import hash_to_hex
-from swh.model.identifiers import CoreSWHID
+from swh.model.swhids import CoreSWHID
def test_access_meta(fuse_mntdir):

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 20, 7:22 PM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3219175

Event Timeline

About · Developer information · Legal