Set publicID when passing plain data to RDF parser. (#91)

* Set publicID when passing plain data to RDF parser.

Author: tetron

requirements.txt

@@ -2,9 +2,8 @@ typing==3.5.2.2 ; python_version>="2.7"
 avro-python3 ; python_version>="3"
 avro==1.8.1 ; python_version<"3"
 ruamel.yaml==0.13.7
-rdflib==4.2.1
+rdflib==4.2.2
 rdflib-jsonld==0.4.0
-html5lib==0.9999999
 mistune==0.7.3
 CacheControl==0.11.7
 lockfile==0.12.2

schema_salad/jsonld_context.py

@@ -236,10 +236,10 @@ def makerdf(workflow,       # type: Union[str, unicode]
     if isinstance(wf, list):
         for w in wf:
             w["@context"] = ctx
-            g.parse(data=json.dumps(w), format='json-ld', location=workflow)
+            g.parse(data=json.dumps(w), format='json-ld', publicID=str(workflow))
     else:
         wf["@context"] = ctx
-        g.parse(data=json.dumps(wf), format='json-ld', location=workflow)
+        g.parse(data=json.dumps(wf), format='json-ld', publicID=str(workflow))
 
     # Bug in json-ld loader causes @id fields to be added to the graph
     for sub, pred, obj in g.triples((None, URIRef("@id"), None)):

schema_salad/ref_resolver.py

@@ -311,7 +311,7 @@ def add_schemas(self, ns, base_url):
                 self.cache[fetchurl] = rdflib.graph.Graph()
                 for fmt in ['xml', 'turtle', 'rdfa']:
                     try:
-                        self.cache[fetchurl].parse(data=content, format=fmt)
+                        self.cache[fetchurl].parse(data=content, format=fmt, publicID=str(fetchurl))
                         self.graph += self.cache[fetchurl]
                         break
                     except xml.sax.SAXParseException:

setup.py

@@ -31,7 +31,7 @@
     'setuptools',
     'requests >= 1.0',
     'ruamel.yaml >= 0.12.4',
-    'rdflib >= 4.2.0, < 4.3.0',
+    'rdflib >= 4.2.2, < 4.3.0',
     'rdflib-jsonld >= 0.3.0, < 0.5.0',
     'mistune >= 0.7.3, < 0.8',
     'typing >= 3.5.2, < 3.6',

tox.ini

@@ -10,11 +10,20 @@ skipsdist = True
 [testenv]
 deps = -rrequirements.txt
 
+[testenv:py35-py2_mypy]
+commands = make mypy
+whitelist_externals = make
+deps =
+  mypy==0.470
+  typed-ast==0.6.3
+  -rrequirements.txt
+
 [testenv:py35-mypy]
 commands = make mypy
 whitelist_externals = make
 deps =
-  mypy>=0.470
+  mypy==0.470
+  typed-ast==0.6.3
   -rrequirements.txt
 
 [testenv:py35-lint]