Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F7123530
D8590.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Subscribers
None
D8590.diff
View Options
diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -2,5 +2,5 @@
swh.core[db,http] >= 0.14
swh.model >= 2.6.1
swh.storage
-swh.graph
+swh.graph >= 2.0.0
swh.journal
diff --git a/swh/provenance/swhgraph/archive.py b/swh/provenance/swhgraph/archive.py
--- a/swh/provenance/swhgraph/archive.py
+++ b/swh/provenance/swhgraph/archive.py
@@ -9,7 +9,7 @@
import grpc
from swh.core.statsd import statsd
-from swh.graph.rpc import swhgraph_pb2, swhgraph_pb2_grpc
+from swh.graph.grpc import swhgraph_pb2, swhgraph_pb2_grpc
from swh.model.model import Sha1Git
from swh.model.swhids import CoreSWHID, ObjectType
from swh.storage.interface import StorageInterface
diff --git a/swh/provenance/tests/conftest.py b/swh/provenance/tests/conftest.py
--- a/swh/provenance/tests/conftest.py
+++ b/swh/provenance/tests/conftest.py
@@ -17,7 +17,7 @@
import pytest
from pytest_postgresql.factories import postgresql
-from swh.graph.http_server import make_app
+from swh.graph.http_rpc_server import make_app
from swh.journal.serializers import msgpack_ext_hook
from swh.model.model import BaseModel, TimestampWithTimezone
from swh.provenance import get_provenance, get_provenance_storage
@@ -169,9 +169,15 @@
def run_grpc_server(queue, dataset_path):
try:
- config = {"graph": {"path": dataset_path}}
+ config = {
+ "graph": {
+ "cls": "local",
+ "grpc_server": {"path": dataset_path},
+ "http_rpc_server": {"debug": True},
+ }
+ }
with loop_context() as loop:
- app = make_app(config=config, debug=True, spawn_rpc_port=None)
+ app = make_app(config=config)
client = TestClient(TestServer(app), loop=loop)
loop.run_until_complete(client.start_server())
url = client.make_url("/graph/")
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Dec 19 2024, 10:04 AM (11 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3220122
Attached To
D8590: Upgrade to swh.graph 2.0
Event Timeline
Log In to Comment