diff options
| author | Ashley Sommer <ashleysommer@gmail.com> | 2020-08-27 14:45:45 +1000 |
|---|---|---|
| committer | Ashley Sommer <ashleysommer@gmail.com> | 2020-08-27 14:45:45 +1000 |
| commit | fbc091208fbf95c338ead7be7547136f5c3433cc (patch) | |
| tree | 58e74adbf7fd96257ca5e17c34f50398a7b469e9 /docs | |
| parent | 466518ed6f74b6cef3b79aa8a917be3c7184284a (diff) | |
| parent | aa527747bd6a5e48ea19463c483f5fb45c7ea230 (diff) | |
| download | rdflib-fbc091208fbf95c338ead7be7547136f5c3433cc.tar.gz | |
Merge remote-tracking branch 'origin/master' into t0b3_master
# Conflicts:
# rdflib/namespace.py
# rdflib/parser.py
# rdflib/plugins/memory.py
# rdflib/plugins/parsers/ntriples.py
# test/test_iomemory.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/persistence.rst | 4 | ||||
| -rw-r--r-- | docs/plugin_parsers.rst | 2 | ||||
| -rw-r--r-- | docs/plugin_stores.rst | 7 | ||||
| -rw-r--r-- | docs/sphinx-requirements.txt | 2 | ||||
| -rw-r--r-- | docs/univrdfstore.rst | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/docs/persistence.rst b/docs/persistence.rst index fbddf38f..bd270a14 100644 --- a/docs/persistence.rst +++ b/docs/persistence.rst @@ -19,8 +19,8 @@ this API for a different store. Stores currently shipped with core RDFLib ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -* :class:`Memory <rdflib.plugins.memory.IOMemory>` (not persistent!) -* :class:`~rdflib.plugins.sleepycat.Sleepycat` (on disk persistence via Python's :ref:`bsddb` or :ref:`bsddb3` packages) +* :class:`Memory <rdflib.plugins.stores.memory.Memory>` (not persistent!) +* :class:`~rdflib.plugins.stores.sleepycat.Sleepycat` (on disk persistence via Python's :ref:`bsddb` or :ref:`bsddb3` packages) * :class:`~rdflib.plugins.stores.sparqlstore.SPARQLStore` - a read-only wrapper around a remote SPARQL Query endpoint. * :class:`~rdflib.plugins.stores.sparqlstore.SPARQLUpdateStore` - a read-write wrapper around a remote SPARQL query/update endpoint pair. diff --git a/docs/plugin_parsers.rst b/docs/plugin_parsers.rst index e114958d..81ab7ae6 100644 --- a/docs/plugin_parsers.rst +++ b/docs/plugin_parsers.rst @@ -26,7 +26,7 @@ mdata :class:`~rdflib.plugins.parsers.structureddata.MicrodataParser` microdata :class:`~rdflib.plugins.parsers.structureddata.MicrodataParser` n3 :class:`~rdflib.plugins.parsers.notation3.N3Parser` nquads :class:`~rdflib.plugins.parsers.nquads.NQuadsParser` -nt :class:`~rdflib.plugins.parsers.nt.NTParser` +nt :class:`~rdflib.plugins.parsers.ntriples.NTParser` rdfa :class:`~rdflib.plugins.parsers.structureddata.RDFaParser` rdfa1.0 :class:`~rdflib.plugins.parsers.structureddata.RDFa10Parser` rdfa1.1 :class:`~rdflib.plugins.parsers.structureddata.RDFaParser` diff --git a/docs/plugin_stores.rst b/docs/plugin_stores.rst index 68063577..a936c54e 100644 --- a/docs/plugin_stores.rst +++ b/docs/plugin_stores.rst @@ -10,9 +10,10 @@ Name Class ================= ============================================================ Auditable :class:`~rdflib.plugins.stores.auditable.AuditableStore` Concurrent :class:`~rdflib.plugins.stores.concurrent.ConcurrentStore` -IOMemory :class:`~rdflib.plugins.memory.IOMemory` +SimpleMemory :class:`~rdflib.plugins.stores.memory.SimpleMemory` +Memory :class:`~rdflib.plugins.stores.memory.Memory` SPARQLStore :class:`~rdflib.plugins.stores.sparqlstore.SPARQLStore` SPARQLUpdateStore :class:`~rdflib.plugins.stores.sparqlstore.SPARQLUpdateStore` -Sleepycat :class:`~rdflib.plugins.sleepycat.Sleepycat` -default :class:`~rdflib.plugins.memory.IOMemory` +Sleepycat :class:`~rdflib.plugins.stores.sleepycat.Sleepycat` +default :class:`~rdflib.plugins.stores.memory.Memory` ================= ============================================================ diff --git a/docs/sphinx-requirements.txt b/docs/sphinx-requirements.txt index abed60cb..175ef14e 100644 --- a/docs/sphinx-requirements.txt +++ b/docs/sphinx-requirements.txt @@ -1,3 +1,3 @@ -sphinx==3.0.4 +sphinx==3.2.1 sphinxcontrib-apidoc git+https://github.com/gniezen/n3pygments.git diff --git a/docs/univrdfstore.rst b/docs/univrdfstore.rst index f6822e5b..dfb96d81 100644 --- a/docs/univrdfstore.rst +++ b/docs/univrdfstore.rst @@ -344,7 +344,7 @@ These are a list of additional kinds of RDF terms (all of which are special Lite Namespace Management Interfaces =============================== -The following namespace management interfaces (defined in Graph) could be implemented in the RDF store. Currently, they exist as stub methods of :class:`~rdflib.store.Store` and are defined in the store subclasses (e.g. :class:`~rdflib.store.IOMemory`): +The following namespace management interfaces (defined in Graph) could be implemented in the RDF store. Currently, they exist as stub methods of :class:`~rdflib.store.Store` and are defined in the store subclasses (e.g. :class:`~rdflib.plugins.store.memory.Memory`): .. automethod:: rdflib.store.Store.bind :noindex: |