Merge pull request #1354 from RDFLib/json_ld_11

JSON-LD Integration

.gitignore

@@ -18,3 +18,4 @@ test_reports/*latest.ttl
 # PyCharm
 .idea/
 prepare_changelog.sh
+.venv/

README.md

@@ -138,8 +138,7 @@ See also [./examples](./examples)
 
 ## Features
 The library contains parsers and serializers for RDF/XML, N3,
-NTriples, N-Quads, Turtle, TriX, RDFa and Microdata. JSON-LD parsing/serializing can be achieved using the 
-[JSON-LD plugin](https://github.com/RDFLib/rdflib-jsonld).
+NTriples, N-Quads, Turtle, TriX, JSON-LD, RDFa and Microdata.
 
 The library presents a Graph interface which can be backed by
 any one of a number of Store implementations.

docs/index.rst

@@ -8,8 +8,8 @@ RDFLib is a pure Python package for working with `RDF <http://www.w3.org/RDF/>`_
 
 * **Parsers & Serializers**
 
-  * for RDF/XML, N3, NTriples, N-Quads, Turtle, TriX, RDFa and Microdata
-  * and JSON-LD, via a plugin module
+  * for RDF/XML, N3, NTriples, N-Quads, Turtle, TriX, JSON-LD, RDFa and Microdata
+
 
 * **Store implementations**
 
@@ -130,4 +130,4 @@ Here are a few RDF and Python terms referred to in this documentation. They are
         The Resource Description Framework (RDF) is a framework for representing information in the Web. RDF data is
         stored in graphs that are sets of subject-predicate-object triples, where the elements may be IRIs, blank nodes,
         or datatyped literals. See the `OWL 2 Web Ontology Language
-        Document Overview <http://www.w3.org/TR/owl-overview/>`_ for more info.
+        Document Overview <http://www.w3.org/TR/owl-overview/>`_ for more info.

docs/upgrade5to6.rst

@@ -16,6 +16,23 @@ compatible with. If you need very long-term backwards-compatibility or Python 2
 Major Changes
 -------------
 
+The most notable changes in RDFLib 6.0.0 are:
+
+Python 3.7+
+^^^^^^^^^^^
+* The oldest version of python you can use to run RDFLib is now 3.7.
+* This is a big jump from RDFLib 5.0.0 that worked on python 2.7 and 3.5.
+* This change is to allow the library maintainers to adopt more modern development tools,
+  newer language features, and avoid the need to support EOL versions of python in he future
+
+JSON-LD integration and JSON-LD 1.1
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+* The json-ld serializer/parser plugin was by far the most commonly used RDFLib addon.
+* Last year we brought it under the RDFLib org in Github
+* Now for 6.0.0 release the JSON-LD serializer and parser are integrated into RDFLib core
+* This includes the experimental support for the JSON-LD v1.1 spec
+* You no longer need to install the json-ld dependency separately.
+
 
 All Changes
 -----------
@@ -56,3 +73,7 @@ Documentation Fixes:
 ^^^^^^^^^^^^^^^^^^^^
 * Fix a doc string in the query module
   `PR #976 <https://github.com/RDFLib/rdflib/pull/976>`_
+
+Integrade JSON-LD into RDFLib:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`PR #1354 <https://github.com/RDFLib/rdflib/pull//1354>`_

rdflib/plugin.py

@@ -168,6 +168,10 @@ def plugins(name=None, kind=None):
 register("ntriples", Serializer, "rdflib.plugins.serializers.nt", "NTSerializer")
 register("nt", Serializer, "rdflib.plugins.serializers.nt", "NTSerializer")
 register("nt11", Serializer, "rdflib.plugins.serializers.nt", "NT11Serializer")
+register("json-ld", Serializer, "rdflib.plugins.serializers.jsonld", "JsonLDSerializer")
+register(
+    "application/ld+json", Serializer, "rdflib.plugins.serializers.jsonld", "JsonLDSerializer"
+)
 
 # Register Quad Serializers
 register(
@@ -198,6 +202,9 @@ def plugins(name=None, kind=None):
 register("ntriples", Parser, "rdflib.plugins.parsers.ntriples", "NTParser")
 register("nt", Parser, "rdflib.plugins.parsers.ntriples", "NTParser")
 register("nt11", Parser, "rdflib.plugins.parsers.ntriples", "NTParser")
+register("application/json+ld", Parser, "rdflib.plugins.parsers.jsonld", "JsonLDParser")
+register("json-ld", Parser, "rdflib.plugins.parsers.jsonld", "JsonLDParser")
+
 
 # Register Quad Parsers
 register("application/n-quads", Parser, "rdflib.plugins.parsers.nquads", "NQuadsParser")