diff --git a/.gitignore b/.gitignore index 7bbc71c..3a6eebc 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,13 @@ celerybeat-schedule .venv venv/ ENV/ +share +include +bin + +# pipenv generated filespip +Pipfile +Pipfile.lock # Spyder project settings .spyderproject @@ -99,3 +106,6 @@ ENV/ # mypy .mypy_cache/ + +#build packages +src diff --git a/.travis.yml b/.travis.yml index 4da93f6..96c381d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ python: - "3.6-dev" # 3.6 development branch - "3.7-dev" install: - - pip install -e git+https://github.com/HTTP-APIs/hydrus#egg=hydrus + - pip install -e git+https://github.com/HTTP-APIs/hydra-python-core#egg=hydra_python_core - pip install -e . script: python -m unittest discover diff --git a/hydra_agent/hydra_graph.py b/hydra_agent/hydra_graph.py index 1d380a0..756c9fb 100644 --- a/hydra_agent/hydra_graph.py +++ b/hydra_agent/hydra_graph.py @@ -2,8 +2,7 @@ from redisgraph import Graph, Node import urllib.request import json -from hydrus.hydraspec import doc_maker -import hydrus +from hydra_python_core import doc_maker, doc_writer from graphviz import Digraph from hydra_agent.classes_objects import ClassEndpoints,RequestError from hydra_agent.collections_endpoint import CollectionEndpoints @@ -21,12 +20,12 @@ def get_apistructure(self,entrypoint_node, api_doc): for support_property in api_doc.entrypoint.entrypoint.supportedProperty: if isinstance( support_property, - hydrus.hydraspec.doc_writer.EntryPointClass): + doc_writer.EntryPointClass): self.class_endpoints[support_property.name] = support_property.id_ if isinstance( support_property, - hydrus.hydraspec.doc_writer.EntryPointCollection): + doc_writer.EntryPointCollection): self.collection_endpoints[support_property.name] = support_property.id_ if len(self.class_endpoints.keys())>0: diff --git a/hydra_agent/querying_mechanism.py b/hydra_agent/querying_mechanism.py index 7ebd87d..4e72fb7 100644 --- a/hydra_agent/querying_mechanism.py +++ b/hydra_agent/querying_mechanism.py @@ -4,7 +4,7 @@ from hydra_agent.hydra_graph import InitialGraph import urllib.request import json -from hydrus.hydraspec import doc_maker +from hydra_python_core import doc_maker from urllib.error import URLError, HTTPError from hydra_agent.collections_endpoint import CollectionEndpoints from hydra_agent.classes_objects import ClassEndpoints,RequestError diff --git a/requirements.txt b/requirements.txt index 8352a8b..7f0c180 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ rdflib rdflib-jsonld uritemplate httplib2 -redis +redis==2.10.6 redisgraph graphviz --e git+https://github.com/HTTP-APIs/hydrus.git#egg=hydrus +-e git+https://github.com/HTTP-APIs/hydra-python-core.git#egg=hydra_python_core