Merge pull request #323 from ckan/upgrade-rdflib-dates

Update tests for changes in date parsing in new rdflib versions
ckan · Nov 25, 2024 · 81a85cc · 81a85cc
2 parents c3cceda + 616a14f
commit 81a85cc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,6 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.ckan-image }}
+      options: --user root
     services:
       solr:
         image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9

diff --git a/ckanext/dcat/profiles/base.py b/ckanext/dcat/profiles/base.py
@@ -433,9 +433,6 @@ def _time_interval(self, subject, predicate, dcat_ap_version=1):
         It checks for time intervals defined with DCAT, W3C Time hasBeginning & hasEnd
         and schema.org startDate & endDate.
 
-        Note that partial dates will be expanded to the first month / day
-        value, eg '1904' -> '1904-01-01'.
-
         Returns a tuple with the start and end date values, both of which
         can be None if not found
         """

diff --git a/ckanext/dcat/tests/profiles/base/test_base_profile.py b/ckanext/dcat/tests/profiles/base/test_base_profile.py
@@ -510,7 +510,7 @@ def test_time_interval_w3c_time_inXSDDateTime(self):
             <dct:PeriodOfTime>
               <time:hasBeginning>
                 <time:Instant>
-                  <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDateTime>
+                  <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDateTime>
                 </time:Instant>
               </time:hasBeginning>
               <time:hasEnd>
@@ -532,7 +532,7 @@ def test_time_interval_w3c_time_inXSDDateTime(self):
 
         start, end = p._time_interval(URIRef('http://example.org'), DCT.temporal)
 
-        assert start == '1904-01-01'
+        assert start == '1904'
         assert end == '2014-03-22'
 
     def test_time_interval_w3c_time_inXSDDateTimeStamp(self):
@@ -548,7 +548,7 @@ def test_time_interval_w3c_time_inXSDDateTimeStamp(self):
             <dct:PeriodOfTime>
               <time:hasBeginning>
                 <time:Instant>
-                  <time:inXSDDateTimeStamp rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDateTimeStamp>
+                  <time:inXSDDateTimeStamp rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDateTimeStamp>
                 </time:Instant>
               </time:hasBeginning>
               <time:hasEnd>
@@ -570,7 +570,7 @@ def test_time_interval_w3c_time_inXSDDateTimeStamp(self):
 
         start, end = p._time_interval(URIRef('http://example.org'), DCT.temporal)
 
-        assert start == '1904-01-01'
+        assert start == '1904'
         assert end == '2014-03-22'
 
     def test_time_interval_w3c_time_inXSDDate(self):
@@ -586,7 +586,7 @@ def test_time_interval_w3c_time_inXSDDate(self):
             <dct:PeriodOfTime>
               <time:hasBeginning>
                 <time:Instant>
-                  <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDate>
+                  <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDate>
                 </time:Instant>
               </time:hasBeginning>
               <time:hasEnd>
@@ -608,7 +608,7 @@ def test_time_interval_w3c_time_inXSDDate(self):
 
         start, end = p._time_interval(URIRef('http://example.org'), DCT.temporal)
 
-        assert start == '1904-01-01'
+        assert start == '1904'
         assert end == '2014-03-22'
 
     def test_time_interval_multiple_w3c_time(self):
@@ -627,9 +627,9 @@ def test_time_interval_multiple_w3c_time(self):
             <dct:PeriodOfTime>
               <time:hasBeginning>
                 <time:Instant>
-                  <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2005</time:inXSDDateTime>
-                  <time:inXSDDateTimeStamp rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDateTimeStamp>
-                  <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1974</time:inXSDDate>
+                  <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">2005</time:inXSDDateTime>
+                  <time:inXSDDateTimeStamp rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDateTimeStamp>
+                  <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1974</time:inXSDDate>
                 </time:Instant>
               </time:hasBeginning>
               <time:hasEnd>
@@ -653,7 +653,7 @@ def test_time_interval_multiple_w3c_time(self):
 
         start, end = p._time_interval(URIRef('http://example.org'), DCT.temporal)
 
-        assert start == '1904-01-01'
+        assert start == '1904'
         assert end == '2014-03-22'
 
     def test_time_interval_dcat(self):
@@ -706,7 +706,7 @@ def test_time_interval_all_dcat_ap_2_dcat_found(self):
                 <dct:PeriodOfTime>
                   <time:hasBeginning>
                     <time:Instant>
-                      <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDateTime>
+                      <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDateTime>
                     </time:Instant>
                   </time:hasBeginning>
                   <time:hasEnd>
@@ -763,7 +763,7 @@ def test_time_interval_all_dcat_ap_1_schema_org_found(self):
                 <dct:PeriodOfTime>
                   <time:hasBeginning>
                     <time:Instant>
-                      <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDateTime>
+                      <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDateTime>
                     </time:Instant>
                   </time:hasBeginning>
                   <time:hasEnd>
@@ -827,7 +827,7 @@ def test_time_interval_all_dcat_ap_2_w3c_time_found(self):
                 <dct:PeriodOfTime>
                     <time:hasBeginning>
                         <time:Instant>
-                        <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#date">1904</time:inXSDDateTime>
+                        <time:inXSDDateTime rdf:datatype="http://www.w3.org/2001/XMLSchema#gYear">1904</time:inXSDDateTime>
                         </time:Instant>
                     </time:hasBeginning>
                     <time:hasEnd>
@@ -849,7 +849,7 @@ def test_time_interval_all_dcat_ap_2_w3c_time_found(self):
 
         start, end = p._time_interval(URIRef('http://example.org'), DCT.temporal, dcat_ap_version=2)
 
-        assert start == '1904-01-01'
+        assert start == '1904'
         assert end == '2014-03-22'
 
     def test_publisher_foaf(self):

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-rdflib>=6.1.1,<7.1.0
+rdflib>=6.1.1,<7.2.0
 geomet>=0.2.0
 ckantoolkit>=0.0.7
 future>=0.18.2