From e434f3865de43619f0aef812bf44f522d6fb7d91 Mon Sep 17 00:00:00 2001
From: Matthias Bodenbenner <m.bodenbenner@wzl-mq.rwth-aachen.de>
Date: Mon, 25 Mar 2024 08:55:50 +0100
Subject: [PATCH] - fixed missing licences of some semantic resources -
changed "schema.org" to http in instead of https
---
README.md | 6 +++++-
setup.py | 2 +-
src/soil/measurement.py | 7 +++++--
src/soil/parameter.py | 4 ++++
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index bdae4e4..fa04e0d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://git-ce.rwth-aachen.de/wzl-mq-ms/forschung-lehre/lava/unified-device-interface/python/commits/master)
# Python Unified Device Interface
-Current stable version: 10.0.7
+Current stable version: 10.0.8
## Installation
1. Install the WZL-UDI package via pip
@@ -69,6 +69,10 @@ Funded by the Deutsche Forschungsgemeinschaft (DFG, German Research Foundation)
## Recent changes
+**10.0.8** - 2024-03-25
+ - fixed missing licences of some semantic resources
+ - changed "schema.org" to http in instead of https
+
**10.0.7** - 2024-03-22
- fixed unit handling for the metadata provisioning
diff --git a/setup.py b/setup.py
index c7cf529..8c4415d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()
setup(name='wzl-udi',
- version='10.0.7',
+ version='10.0.8',
url='https://git-ce.rwth-aachen.de/wzl-mq-public/soil/python',
project_urls={
"Bug Tracker": "https://git-ce.rwth-aachen.de/wzl-mq-public/soil/python/-/issues",
diff --git a/src/soil/measurement.py b/src/soil/measurement.py
index 5fb91c5..b77734a 100644
--- a/src/soil/measurement.py
+++ b/src/soil/measurement.py
@@ -215,6 +215,9 @@ class Measurement(Variable):
elif resource_type == ResourceType.metadata:
result = self._metadata
+ result.add((Semantics.namespace[f'{self._semantic_name}Range'], Namespaces.schema.license,
+ Semantics.metadata_license))
+
elif resource_type == ResourceType.range:
result = copy.deepcopy(self._metadata)
subjects = result.subjects()
@@ -269,7 +272,7 @@ class Measurement(Variable):
data_graph.bind('earl', Namespaces.earl)
data_graph.add((uncertainty_subject, Namespaces.rdf.type, Namespaces.earl.NotApplicable))
- data_graph.add((uncertainty_subject, Namespaces.schema.license, Semantics.data_license))
+ data_graph.add((uncertainty_subject, Namespaces.schema.license, Semantics.metadata_license))
result = data_graph
elif resource_type == ResourceType.observation:
@@ -292,7 +295,7 @@ class Measurement(Variable):
(measurement_subject, Namespaces.sosa.observedProperty, Semantics.namespace[self._semantic_name]))
data_graph.add((measurement_subject, Namespaces.sosa.hasResult, result_subject))
data_graph.add((measurement_subject, Namespaces.sosa.madeBySensor, sensor_triples[0][2]))
- data_graph.add((measurement_subject, Namespaces.schema.license, Semantics.data_license))
+ data_graph.add((measurement_subject, Namespaces.schema.license, Semantics.metadata_license))
result = data_graph
else:
diff --git a/src/soil/parameter.py b/src/soil/parameter.py
index 70cf90d..4b8ce66 100644
--- a/src/soil/parameter.py
+++ b/src/soil/parameter.py
@@ -149,6 +149,8 @@ class Parameter(Variable):
for subject in subjects:
if subject != Semantics.namespace[f'{self._semantic_name}Range']:
range_graph.remove((subject, None, None))
+ range_graph.add((Semantics.namespace[f'{self._semantic_name}Range'], Namespaces.schema.license,
+ Semantics.metadata_license))
return range_graph
elif resource_type == ResourceType.metadata:
result = copy.deepcopy(self._metadata)
@@ -161,6 +163,8 @@ class Parameter(Variable):
try:
rdf_value = self.serialize_value(result, self.__getitem__('value', 0))
result.add((Semantics.namespace[self._semantic_name], Namespaces.qudt['value'], rdf_value))
+ result.add((Semantics.namespace[f'{self._semantic_name}Range'], Namespaces.schema.license,
+ Semantics.metadata_license))
except DeviceException as e:
if isinstance(e._predecessor, NotImplementedException):
pass
--
GitLab