Merge pull request #17 from BONSAMURAIS/rdflib6

Rdflib6

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.3] - 2021-12-03
+### Changed
+- Use rdflib >= 6
+- Fixed #14 by correctly referencing DC/DCTERMS entries
+
 ## [0.5.3] - 2021-12-03
 ### Changed
 - Dependency to rdflib has been pinned to < 6 (see issue #14)

Pipfile

@@ -8,7 +8,7 @@ verify_ssl = true
 [packages]
 docopt = "*"
 pandas = "==0.25.3"
-rdflib = "<6"
+rdflib = ">=6"
 xlrd = "*"
 pyxlsb = "*"
 importlib_resources = "*"

requirements.txt

@@ -1,6 +1,6 @@
 appdirs
 docopt
-rdflib<6
+rdflib>=6
 pandas
 xlrd
 pyxlsb

setup.py

@@ -35,7 +35,7 @@ def package_files(directory):
 
 setup(
     name="ystafdb",
-    version="0.5.3",
+    version="0.6.0",
     packages=packages,
     description="CLI tool to parse YSTAFDB and produce ttl/nt/xml.",
     long_description=open("README.md").read(),
@@ -46,7 +46,7 @@ def package_files(directory):
     # Only if you have non-python data (CSV, etc.). Might need to change the directory name as well.
     # package_data={"your_name_here": package_files(os.path.join("your_library_name", "data"))},
     entry_points={"console_scripts": ["ystafdb-cli = ystafdb.bin.ystafdb:main",]},
-    install_requires=["appdirs", "docopt", "rdflib<6", "pandas", "xlrd", "pyxlsb"],
+    install_requires=["appdirs", "docopt", "rdflib>=6", "pandas", "xlrd", "pyxlsb"],
     url="https://github.com/BONSAMURAIS/ystafdb/",
     classifiers=[
         "Intended Audience :: End Users/Desktop",

ystafdb/__init__.py

@@ -2,7 +2,7 @@
     "generate_foaf_uris",
     "generate_ystafdb_metadata_uris"
 )
-VERSION = (0, 4)
+VERSION = (0, 6, 0)
 __version__ = ".".join(str(v) for v in VERSION)
 
 data_dir = "../data"
@@ -13,4 +13,4 @@
 
 def generate_ystafdb(args):
     generate_foaf_uris(args)
-    generate_ystafdb_metadata_uris(args)
+    generate_ystafdb_metadata_uris(args)

ystafdb/foaf.py

@@ -1,7 +1,7 @@
 from .filesystem import write_graph
 from pathlib import Path
 from rdflib import Graph, Literal, RDF, URIRef, Namespace
-from rdflib.namespace import FOAF, SKOS, DC, OWL, XSD
+from rdflib.namespace import FOAF, SKOS, DC, OWL, XSD, DCTERMS
 import datetime
 from . import __version__
 from .config_parser import get_config_data
@@ -28,6 +28,7 @@ def generate_foaf_uris(args):
     g.bind("skos", SKOS)
     g.bind("foaf", FOAF)
     g.bind("dc", DC)
+    g.bind("dcterms", DCTERMS)
     g.bind("owl", OWL)
     g.bind("prov", prov)
     g.bind("bfoaf", bfoaf)
@@ -41,8 +42,8 @@ def generate_foaf_uris(args):
     g.add((node, DC.creator, bonsaifoaf.bonsai))
     g.add((node, DC.description, Literal("Instances of Organizations")))
     g.add((node, vann.preferredNamespaceUri, URIRef(bfoaf)))
-    g.add((node, DC.license, URIRef("https://creativecommons.org/licenses/by/3.0/")))
-    g.add((node, DC.modified, Literal(today, datatype=XSD.date)))
+    g.add((node, DCTERMS.license, URIRef("https://creativecommons.org/licenses/by/3.0/")))
+    g.add((node, DCTERMS.modified, Literal(today, datatype=XSD.date)))
     g.add((node, DC.publisher, bonsaifoaf.bonsai))
     g.add((node, DC.title, Literal("Organizations")))
     g.add((node, OWL.versionInfo, Literal(__version__)))

ystafdb/graph_common.py

@@ -1,7 +1,7 @@
 from .filesystem import write_graph
 from pathlib import Path
 from rdflib import Literal, RDF, URIRef, Namespace, Graph
-from rdflib.namespace import DC, RDFS, OWL, FOAF, XSD, SKOS
+from rdflib.namespace import DC, RDFS, OWL, FOAF, XSD, SKOS, DCTERMS
 from.config_parser import does_provider_dataset_combi_exist
 import datetime
 from . import __version__
@@ -41,6 +41,7 @@ def add_common_elements(graph, base_uri, title, description, author, provider=No
 
     graph.bind("bont", "http://ontology.bonsai.uno/core#")
     graph.bind("dc", DC)
+    graph.bind("dcterms", DCTERMS)
     graph.bind("foaf", FOAF)
     graph.bind("xsd", XSD)
     graph.bind("owl", OWL)
@@ -59,7 +60,7 @@ def add_common_elements(graph, base_uri, title, description, author, provider=No
     graph.add((node, NS.vann.preferredNamespaceUri, URIRef("{}#".format(base_uri))))
     graph.add((node, OWL.versionInfo, Literal(__version__)))
     today = datetime.datetime.now().strftime("%Y-%m-%d")
-    graph.add((node, DC.modified, Literal(today, datatype=XSD.date)))
+    graph.add((node, DCTERMS.modified, Literal(today, datatype=XSD.date)))
     graph.add((node, DC.publisher, bfoaf.bonsai))
     graph.add((node, DC.creator, bfoaf.bonsai))
 

ystafdb/provenance_uris.py

@@ -1,6 +1,6 @@
 from .filesystem import write_graph
 from rdflib import Graph, Literal, RDF, URIRef, Namespace
-from rdflib.namespace import FOAF, SKOS, DC, OWL, XSD, RDFS
+from rdflib.namespace import FOAF, SKOS, DC, OWL, XSD, RDFS, DCTERMS
 import datetime
 from . import __version__
 from pathlib import Path
@@ -24,6 +24,7 @@ def get_empty_prov_graph():
     g.bind("skos", SKOS)
     g.bind("foaf", FOAF)
     g.bind("dc", DC)
+    g.bind("dcterms", DCTERMS)
     g.bind("owl", OWL)
     g.bind("rdfs", RDFS)
     g.bind("prov", prov)
@@ -54,8 +55,8 @@ def add_prov_meta_information(g):
     g.add((node, DC.description, Literal("Provenance information about datasets and data extraction activities")))
     g.add((node, vann.preferredNamespaceUri, URIRef(bprov)))
     g.add((node, DC.creator, bonsaifoaf.bonsai))
-    g.add((node, DC.license, URIRef("https://creativecommons.org/licenses/by/3.0/")))
-    g.add((node, DC.modified, Literal(today, datatype=XSD.date)))
+    g.add((node, DCTERMS.license, URIRef("https://creativecommons.org/licenses/by/3.0/")))
+    g.add((node, DCTERMS.modified, Literal(today, datatype=XSD.date)))
     g.add((node, DC.publisher, bonsaifoaf.bonsai))
     g.add((node, DC.title, Literal("Provenance information")))
     g.add((node, OWL.versionInfo, Literal(__version__)))
@@ -76,10 +77,10 @@ def add_prov_meta_information(g):
             )
         )
         g.add((datasetUri, OWL.versionInfo, Literal(dataset['version'].replace('_', '.'))))
-        g.add((datasetUri, DC.term("license"), URIRef(dataset['license'])))
-        g.add((datasetUri, DC.term("date"), Literal(dataset['update_date'], datatype=XSD.date)))
+        g.add((datasetUri, DCTERMS.license, URIRef(dataset['license'])))
+        g.add((datasetUri, DC.date, Literal(dataset['update_date'], datatype=XSD.date)))
         g.add((datasetUri, prov.wasAttributedTo, URIRef(bfoaf["provider_{}".format(dataset['id'])])))
-        g.add((datasetUri, DC.term("rights"), Literal(dataset['rights'])))
+        g.add((datasetUri, DC.rights, Literal(dataset['rights'])))
         g.add((datasetUri, prov.hadPrimarySource, URIRef(dataset['download_uri'])))
         g.add((node, prov.hadMember, datasetUri))
 
@@ -127,4 +128,4 @@ def add_prov_meta_information(g):
         )
     )
 
-    return g
+    return g