Skip to content

Fixing Redis breaking change #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xadahiya merged 16 commits into from
Mar 4, 2019
Merged

Fixing Redis breaking change #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
370230a
Update gitignore to include Pipenv generated files
de-sh Feb 24, 2019
3947783
Update repo to use hydra_python_core module
de-sh Feb 25, 2019
27f796f
Update CI test config
de-sh Feb 25, 2019
db7ed35
Add missing import
de-sh Mar 2, 2019
bf3e397
Fixing requirements
gustavodemorais Mar 2, 2019
a1f74ba
Porting hydraspec to hydra_python_Core
gustavodemorais Mar 2, 2019
9cd8c18
Fixing typos in import
gustavodemorais Mar 2, 2019
c7a7aba
Adding import hydra_python_core
gustavodemorais Mar 2, 2019
6b95957
Adding some virtualenv folders and build packages
gustavodemorais Mar 2, 2019
c760223
Setting Redis version as 2 because of breaking change in Redis 3
gustavodemorais Mar 2, 2019
29808b3
Changing test due to hydraspec port to hydra_python_core
gustavodemorais Mar 2, 2019
d7a4348
Removed completely the dependency of hydrus
gustavodemorais Mar 2, 2019
b952f19
Merge pull request #87 from de-sh/develop
xadahiya Mar 3, 2019
cc35df2
Updating gitignore to add virtualenv and built packages dirs
gustavodemorais Mar 3, 2019
fb18d31
Setting Redis version as 2 because of breaking change in Redis 3
gustavodemorais Mar 3, 2019
442bfed
Merge remote-tracking branch 'Guttz/develop' into develop
gustavodemorais Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ celerybeat-schedule
.venv
venv/
ENV/
share
include
bin

# pipenv generated filespip
Pipfile
Pipfile.lock

# Spyder project settings
.spyderproject
Expand All @@ -99,3 +106,6 @@ ENV/

# mypy
.mypy_cache/

#build packages
src
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions hydra_agent/hydra_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion hydra_agent/querying_mechanism.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@xadahiya xadahiya Mar 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't need both these imports. You can either import hydra_python_core and use hydra_python_core.doc_maker or import dic_maker directly. I don't see the reason to do both

Copy link
Contributor Author

@gustavodemorais gustavodemorais Mar 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. Already fixed and re-based according to @de-sh commit.

from urllib.error import URLError, HTTPError
from hydra_agent.collections_endpoint import CollectionEndpoints
from hydra_agent.classes_objects import ClassEndpoints,RequestError
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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