Skip to content

Commit d827616

Browse files
committed
downgrade to prov 1.5.1
1 parent 48e60e7 commit d827616

17 files changed

Lines changed: 379 additions & 691 deletions

cwlprov/prov.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@
5555
ProvSpecialization,
5656
ProvStart,
5757
ProvUsage,
58-
QualifiedNameCandidate,
5958
)
6059

6160
from .utils import first, prov_type
6261

6362
if TYPE_CHECKING:
63+
from prov.model import QualifiedNameCandidate
64+
6465
from .ro import ResearchObject
6566

6667
CWLPROV = Namespace("cwlprov", "https://w3id.org/cwl/prov#")
@@ -225,10 +226,10 @@ def __repr__(self) -> str:
225226
def __str__(self) -> str:
226227
return self.record.get_provn()
227228

228-
def _prov_attr(self, attr: QualifiedNameCandidate) -> Optional[QualifiedName]:
229+
def _prov_attr(self, attr: "QualifiedNameCandidate") -> Optional[QualifiedName]:
229230
return first(self._prov_attrs(attr))
230231

231-
def _prov_attrs(self, attr: QualifiedNameCandidate) -> set[QualifiedName]:
232+
def _prov_attrs(self, attr: "QualifiedNameCandidate") -> set[QualifiedName]:
232233
return self.record.get_attribute(attr)
233234

234235

mypy-stubs/prov/__init__.pyi

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import os
2-
from prov.model import ProvDocument
3-
4-
__all__ = ["Error", "model", "read"]
1+
from _typeshed import Incomplete
52

63
class Error(Exception): ...
74

8-
def read(
9-
source: str | bytes | os.PathLike[str], format: str | None = None
10-
) -> ProvDocument | None: ...
5+
# def read(source, format: Incomplete | None = ...): ...
116

127
# Names in __all__ with no definition:
138
# model

mypy-stubs/prov/constants.pyi

Lines changed: 0 additions & 91 deletions
This file was deleted.

mypy-stubs/prov/dot.pyi

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,41 @@
1-
import pydot
21
from _typeshed import Incomplete
3-
from prov.graph import INFERRED_ELEMENT_CLASS as INFERRED_ELEMENT_CLASS
4-
from prov.identifier import QualifiedName as QualifiedName
5-
from prov.model import (
6-
Identifier as Identifier,
7-
PROV_ACTIVITY as PROV_ACTIVITY,
8-
PROV_AGENT as PROV_AGENT,
9-
PROV_ALTERNATE as PROV_ALTERNATE,
10-
PROV_ASSOCIATION as PROV_ASSOCIATION,
11-
PROV_ATTRIBUTE_QNAMES as PROV_ATTRIBUTE_QNAMES,
12-
PROV_ATTRIBUTION as PROV_ATTRIBUTION,
13-
PROV_BUNDLE as PROV_BUNDLE,
14-
PROV_COMMUNICATION as PROV_COMMUNICATION,
15-
PROV_DELEGATION as PROV_DELEGATION,
16-
PROV_DERIVATION as PROV_DERIVATION,
17-
PROV_END as PROV_END,
18-
PROV_ENTITY as PROV_ENTITY,
19-
PROV_GENERATION as PROV_GENERATION,
20-
PROV_INFLUENCE as PROV_INFLUENCE,
21-
PROV_INVALIDATION as PROV_INVALIDATION,
22-
PROV_MEMBERSHIP as PROV_MEMBERSHIP,
23-
PROV_MENTION as PROV_MENTION,
24-
PROV_SPECIALIZATION as PROV_SPECIALIZATION,
25-
PROV_START as PROV_START,
26-
PROV_USAGE as PROV_USAGE,
27-
ProvActivity as ProvActivity,
28-
ProvAgent as ProvAgent,
29-
ProvBundle as ProvBundle,
30-
ProvElement as ProvElement,
31-
ProvEntity as ProvEntity,
32-
ProvException as ProvException,
33-
ProvRecord as ProvRecord,
34-
sorted_attributes as sorted_attributes,
35-
)
36-
from typing import Any
2+
from prov.model import PROV_ACTIVITY as PROV_ACTIVITY
3+
from prov.model import PROV_AGENT as PROV_AGENT
4+
from prov.model import PROV_ALTERNATE as PROV_ALTERNATE
5+
from prov.model import PROV_ASSOCIATION as PROV_ASSOCIATION
6+
from prov.model import PROV_ATTRIBUTE_QNAMES as PROV_ATTRIBUTE_QNAMES
7+
from prov.model import PROV_ATTRIBUTION as PROV_ATTRIBUTION
8+
from prov.model import PROV_BUNDLE as PROV_BUNDLE
9+
from prov.model import PROV_COMMUNICATION as PROV_COMMUNICATION
10+
from prov.model import PROV_DELEGATION as PROV_DELEGATION
11+
from prov.model import PROV_DERIVATION as PROV_DERIVATION
12+
from prov.model import PROV_END as PROV_END
13+
from prov.model import PROV_ENTITY as PROV_ENTITY
14+
from prov.model import PROV_GENERATION as PROV_GENERATION
15+
from prov.model import PROV_INFLUENCE as PROV_INFLUENCE
16+
from prov.model import PROV_INVALIDATION as PROV_INVALIDATION
17+
from prov.model import PROV_MEMBERSHIP as PROV_MEMBERSHIP
18+
from prov.model import PROV_MENTION as PROV_MENTION
19+
from prov.model import PROV_SPECIALIZATION as PROV_SPECIALIZATION
20+
from prov.model import PROV_START as PROV_START
21+
from prov.model import PROV_USAGE as PROV_USAGE
22+
from prov.model import Identifier as Identifier
23+
from prov.model import ProvException as ProvException
24+
from prov.model import sorted_attributes as sorted_attributes
3725

38-
GENERIC_NODE_STYLE: dict[type[ProvElement | ProvBundle] | None, dict[str, str]]
3926
DOT_PROV_STYLE: Incomplete
4027
ANNOTATION_STYLE: Incomplete
4128
ANNOTATION_LINK_STYLE: Incomplete
4229
ANNOTATION_START_ROW: str
4330
ANNOTATION_ROW_TEMPLATE: str
4431
ANNOTATION_END_ROW: str
4532

46-
def htlm_link_if_uri(value: Any) -> str: ...
33+
def htlm_link_if_uri(value): ...
4734
def prov_to_dot(
48-
bundle: ProvBundle,
49-
show_nary: bool = True,
50-
use_labels: bool = False,
51-
direction: str = "BT",
52-
show_element_attributes: bool = True,
53-
show_relation_attributes: bool = True,
54-
) -> pydot.Dot: ...
35+
bundle,
36+
show_nary: bool = ...,
37+
use_labels: bool = ...,
38+
direction: str = ...,
39+
show_element_attributes: bool = ...,
40+
show_relation_attributes: bool = ...,
41+
): ...

mypy-stubs/prov/graph.pyi

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,28 @@
1-
import networkx as nx
21
from _typeshed import Incomplete
3-
from prov.model import (
4-
PROV_ATTR_ACTIVITY as PROV_ATTR_ACTIVITY,
5-
PROV_ATTR_AGENT as PROV_ATTR_AGENT,
6-
PROV_ATTR_ALTERNATE1 as PROV_ATTR_ALTERNATE1,
7-
PROV_ATTR_ALTERNATE2 as PROV_ATTR_ALTERNATE2,
8-
PROV_ATTR_BUNDLE as PROV_ATTR_BUNDLE,
9-
PROV_ATTR_COLLECTION as PROV_ATTR_COLLECTION,
10-
PROV_ATTR_DELEGATE as PROV_ATTR_DELEGATE,
11-
PROV_ATTR_ENDER as PROV_ATTR_ENDER,
12-
PROV_ATTR_ENTITY as PROV_ATTR_ENTITY,
13-
PROV_ATTR_GENERAL_ENTITY as PROV_ATTR_GENERAL_ENTITY,
14-
PROV_ATTR_GENERATED_ENTITY as PROV_ATTR_GENERATED_ENTITY,
15-
PROV_ATTR_INFORMANT as PROV_ATTR_INFORMANT,
16-
PROV_ATTR_INFORMED as PROV_ATTR_INFORMED,
17-
PROV_ATTR_PLAN as PROV_ATTR_PLAN,
18-
PROV_ATTR_RESPONSIBLE as PROV_ATTR_RESPONSIBLE,
19-
PROV_ATTR_SPECIFIC_ENTITY as PROV_ATTR_SPECIFIC_ENTITY,
20-
PROV_ATTR_STARTER as PROV_ATTR_STARTER,
21-
PROV_ATTR_TRIGGER as PROV_ATTR_TRIGGER,
22-
PROV_ATTR_USED_ENTITY as PROV_ATTR_USED_ENTITY,
23-
ProvActivity as ProvActivity,
24-
ProvAgent as ProvAgent,
25-
ProvBundle as ProvBundle,
26-
ProvDocument as ProvDocument,
27-
ProvElement as ProvElement,
28-
ProvEntity as ProvEntity,
29-
ProvRecord as ProvRecord,
30-
ProvRelation as ProvRelation,
31-
)
2+
from prov.model import PROV_ATTR_ACTIVITY as PROV_ATTR_ACTIVITY
3+
from prov.model import PROV_ATTR_AGENT as PROV_ATTR_AGENT
4+
from prov.model import PROV_ATTR_ALTERNATE1 as PROV_ATTR_ALTERNATE1
5+
from prov.model import PROV_ATTR_ALTERNATE2 as PROV_ATTR_ALTERNATE2
6+
from prov.model import PROV_ATTR_COLLECTION as PROV_ATTR_COLLECTION
7+
from prov.model import PROV_ATTR_DELEGATE as PROV_ATTR_DELEGATE
8+
from prov.model import PROV_ATTR_ENTITY as PROV_ATTR_ENTITY
9+
from prov.model import PROV_ATTR_GENERAL_ENTITY as PROV_ATTR_GENERAL_ENTITY
10+
from prov.model import PROV_ATTR_GENERATED_ENTITY as PROV_ATTR_GENERATED_ENTITY
11+
from prov.model import PROV_ATTR_INFORMANT as PROV_ATTR_INFORMANT
12+
from prov.model import PROV_ATTR_INFORMED as PROV_ATTR_INFORMED
13+
from prov.model import PROV_ATTR_RESPONSIBLE as PROV_ATTR_RESPONSIBLE
14+
from prov.model import PROV_ATTR_SPECIFIC_ENTITY as PROV_ATTR_SPECIFIC_ENTITY
15+
from prov.model import PROV_ATTR_TRIGGER as PROV_ATTR_TRIGGER
16+
from prov.model import PROV_ATTR_USED_ENTITY as PROV_ATTR_USED_ENTITY
17+
from prov.model import ProvActivity as ProvActivity
18+
from prov.model import ProvAgent as ProvAgent
19+
from prov.model import ProvDocument as ProvDocument
20+
from prov.model import ProvElement as ProvElement
21+
from prov.model import ProvEntity as ProvEntity
22+
from prov.model import ProvRecord as ProvRecord
23+
from prov.model import ProvRelation as ProvRelation
3224

3325
INFERRED_ELEMENT_CLASS: Incomplete
3426

35-
def prov_to_graph(prov_document: ProvDocument) -> nx.MultiDiGraph: ...
36-
def graph_to_prov(g: nx.MultiDiGraph) -> ProvDocument: ...
27+
def prov_to_graph(prov_document): ...
28+
def graph_to_prov(g): ...

mypy-stubs/prov/identifier.pyi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Any
1+
from typing import Any, Union
22

33
class Identifier:
44
def __init__(self, uri: str) -> None: ...
@@ -9,9 +9,9 @@ class Identifier:
99
def provn_representation(self) -> str: ...
1010

1111
class QualifiedName(Identifier):
12-
def __init__(self, namespace: Namespace, localpart: str) -> None: ...
12+
def __init__(self, namespace: str, localpart: str) -> None: ...
1313
@property
14-
def namespace(self) -> Namespace: ...
14+
def namespace(self) -> str: ...
1515
@property
1616
def localpart(self) -> str: ...
1717
def __hash__(self) -> int: ...
@@ -23,8 +23,8 @@ class Namespace:
2323
def uri(self) -> str: ...
2424
@property
2525
def prefix(self) -> str: ...
26-
def contains(self, identifier: Identifier) -> bool: ...
27-
def qname(self, identifier: str | Identifier) -> QualifiedName | None: ...
26+
def contains(self, identifier: Identifier | str) -> bool: ...
27+
def qname(self, identifier: Identifier | str) -> QualifiedName: ...
2828
def __eq__(self, other: Any) -> bool: ...
2929
def __ne__(self, other: Any) -> bool: ...
3030
def __hash__(self) -> int: ...

0 commit comments

Comments
 (0)