From a82981af4d6fbe2498cdee1aa7b8087ab7a9c8fd Mon Sep 17 00:00:00 2001 From: Aaron Gary Date: Mon, 6 Aug 2018 10:12:55 -0700 Subject: [PATCH] Updated to use latest ndex2 client changes. --- src/cx_rdf/aspect_policy.py | 2 +- src/cx_rdf/predicate_policy.py | 2 +- tests/test_export.py | 16 ++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/cx_rdf/aspect_policy.py b/src/cx_rdf/aspect_policy.py index bffc643..c492b96 100644 --- a/src/cx_rdf/aspect_policy.py +++ b/src/cx_rdf/aspect_policy.py @@ -6,7 +6,7 @@ import logging from typing import Dict, List, Optional -from ndex2.cx import known_aspects +from ndex2 import known_aspects from rdflib import BNode, Graph, Literal, RDF, RDFS from .constants import CX diff --git a/src/cx_rdf/predicate_policy.py b/src/cx_rdf/predicate_policy.py index ef32b4b..3b0d0fe 100644 --- a/src/cx_rdf/predicate_policy.py +++ b/src/cx_rdf/predicate_policy.py @@ -30,7 +30,7 @@ import logging from typing import Dict, List, Optional -from ndex2.cx import known_aspects +from ndex2 import known_aspects from rdflib import BNode, Graph, Literal, Namespace, RDF from .abstract_policy import _handle_aspects diff --git a/tests/test_export.py b/tests/test_export.py index 93a2399..bac8ae3 100644 --- a/tests/test_export.py +++ b/tests/test_export.py @@ -7,9 +7,6 @@ from cx_rdf import cx_to_rdf_graph from ndex2 import NiceCXNetwork -from ndex2.cx import CX_CONSTANTS -from ndex2.cx.aspects.CitationElement import CitationElement -from ndex2.cx.aspects.SupportElement import SupportElement from rdflib import Graph @@ -42,11 +39,11 @@ def setUpClass(cls): edge_interaction='increases', ) - c1 = CitationElement(id=0, title='Hi') - cx_network.add_citation(c1) + c1 = cx_network.add_citation(id=0, title='Hi') + cx_network.add_edge_citations(e1, c1.get('@id')) - s1 = SupportElement(id=0, text='Hi') - cx_network.add_support(s1) + s1 = cx_network.add_support(id=0, text='Hi') + cx_network.add_edge_supports(e1, s1.get('@id')) cx_network.add_node_attribute(property_of=a, name='Color', values='Red') cx_network.add_node_attribute(property_of=b, name='Color', values='Red') @@ -65,10 +62,9 @@ def setUpClass(cls): cx_network.add_edge_attribute(property_of=e1, name='Color', values='Green') cx_network.add_edge_attribute(property_of=e2, name='Color', values='Purple') - cx_network.add_edge_citations(edge_id=e1, citation_id=c1.get_id()) + cx_network.add_edge_citations(edge_id=e1, citation_id=c1.get('@id')) - edge_support_element_1 = {CX_CONSTANTS.PROPERTY_OF: [e1], CX_CONSTANTS.SUPPORTS: [c1.get_id()]} - cx_network.add_edge_supports(edge_supports_element=edge_support_element_1) + cx_network.add_edge_supports(e1, c1.get('@id')) cls.cx_json = json.loads(json.dumps(cx_network.to_cx())) print(json.dumps(cls.cx_json, indent=2))