udata 10.0.2.dev32490__py2.py3-none-any.whl → 10.0.2.dev32505__py2.py3-none-any.whl

udata/core/organization/rdf.py

@@ -49,7 +49,7 @@ def build_org_catalog(org, datasets, dataservices, format=None):
     for dataset in datasets:
         catalog.add(DCAT.dataset, dataset_to_rdf(dataset, graph))
     for dataservice in dataservices:
-        catalog.add(DCAT.dataservice, dataservice_to_rdf(dataservice, graph))
+        catalog.add(DCAT.service, dataservice_to_rdf(dataservice, graph))
 
     values = {"org": org.id}
 

udata/core/site/rdf.py

@@ -43,7 +43,7 @@ def build_catalog(site, datasets, dataservices=[], format=None):
 
     for dataservice in dataservices:
         rdf_dataservice = dataservice_to_rdf(dataservice, graph)
-        catalog.add(DCAT.DataService, rdf_dataservice)
+        catalog.add(DCAT.service, rdf_dataservice)
 
     if isinstance(datasets, Paginable):
         paginate_catalog(catalog, graph, datasets, format, "api.site_rdf_catalog_format")

udata/tests/organization/test_organization_rdf.py

@@ -72,7 +72,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         self.assertEqual(str(catalog.identifier), uri)
 
         self.assertEqual(len(list(catalog.objects(DCAT.dataset))), len(datasets))
-        self.assertEqual(len(list(catalog.objects(DCAT.dataservice))), len(dataservices))
+        self.assertEqual(len(list(catalog.objects(DCAT.service))), len(dataservices))
 
         org = catalog.value(DCT.publisher)
         self.assertEqual(org.value(RDF.type).identifier, FOAF.Organization)
@@ -138,7 +138,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         self.assertEqual(len(list(catalog.objects(DCAT.dataset))), page_size)
         # All dataservices that are not linked to a dataset are listed in the first page.
         # See DataserviceQuerySet.filter_by_dataset_pagination.
-        self.assertEqual(len(list(catalog.objects(DCAT.dataservice))), total)
+        self.assertEqual(len(list(catalog.objects(DCAT.service))), total)
 
         paginations = list(graph.subjects(RDF.type, HYDRA.PartialCollectionView))
         self.assertEqual(len(paginations), 1)
@@ -166,7 +166,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         # 5 datasets total, 3 on the first page, 2 on the second.
         self.assertEqual(len(list(catalog.objects(DCAT.dataset))), 2)
         # 1 extra_dataservice, listed on the same page as its associated extra_dataset.
-        self.assertEqual(len(list(catalog.objects(DCAT.dataservice))), 1)
+        self.assertEqual(len(list(catalog.objects(DCAT.service))), 1)
 
         paginations = list(graph.subjects(RDF.type, HYDRA.PartialCollectionView))
         self.assertEqual(len(paginations), 1)

udata/tests/site/test_site_rdf.py

@@ -270,9 +270,14 @@ class SiteRdfViewsTest:
         datasets = list(graph.subjects(RDF.type, DCAT.Dataset))
         assert len(datasets) == 3
 
+        # 4 objects of RDF.type DCAT.DataService
         dataservices = list(graph.subjects(RDF.type, DCAT.DataService))
         assert len(dataservices) == 4
 
+        # these 4 objects are also bound to catalog by DCAT.service predicate
+        catalog = graph.resource(next(graph.subjects(RDF.type, DCAT.Catalog)))
+        assert len(list(catalog.objects(DCAT.service))) == 4
+
         # Test first page contains the dataservice without dataset
         response = client.get(
             url_for("api.site_rdf_catalog_format", format="xml", page_size=1),

{udata-10.0.2.dev32490.dist-info → udata-10.0.2.dev32505.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.2.dev32490
+Version: 10.0.2.dev32505
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -140,7 +140,8 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
-- Nothing yet
+- Use correct DCAT.service predicate in RDF output [#3199](https://github.com/opendatateam/udata/pull/3199)
+- Fix the Badge.badge_label method [#3198](https://github.com/opendatateam/udata/pull/3198)
 
 ## 10.0.1 (2024-11-15)
 

{udata-10.0.2.dev32490.dist-info → udata-10.0.2.dev32505.dist-info}/RECORD

@@ -152,7 +152,7 @@ udata/core/organization/metrics.py,sha256=UlHOBOph9s_QW-X7dkEivVITdyZ0ku9kLKl7Bm
 udata/core/organization/models.py,sha256=pOVtlWgXQ_HxWZASJ7W5vusove-gqZ6o2TNsP2IbAjA,8945
 udata/core/organization/notifications.py,sha256=i_36-l2y7fOGmnBmr5NDWmGGmrGRaCWbU-6XS4c2wQs,917
 udata/core/organization/permissions.py,sha256=GD-9TMtRppVCPaC1ysXYrONvGJV-ArzAOXm2XMKf9yo,1256
-udata/core/organization/rdf.py,sha256=GmWliHFf356cUiXfNuK56b-O-zRNQqxLKJhNULGVcKA,1940
+udata/core/organization/rdf.py,sha256=TF2c85MHAu-TRiHNLxqV_Pw5z6sCgZrNszF9SYspQpk,1936
 udata/core/organization/search.py,sha256=5XMZn7xehkTV4X9NvGys_1WyHDGlUVpCQ_uJ3oyWdsE,2227
 udata/core/organization/signals.py,sha256=Ft1MBU9S41uxFN-rUrKHhiwedR1OYGv-ncuroKg8orY,488
 udata/core/organization/tasks.py,sha256=2Pd9ixeKNd7BGxBHrHYbR9AelhqkflX3ocnGgtoa8Uc,5641
@@ -188,7 +188,7 @@ udata/core/site/api.py,sha256=OwlzjgwdrtEemw63cxc4HYEGe5n-oN0sEXCzjt22ebA,4545
 udata/core/site/factories.py,sha256=O0nLFmjrFyemzcs-YwNukq5nqd383KBGrgL5bOQsGbA,378
 udata/core/site/forms.py,sha256=avEZ4rJhibF7sKexqMlKt1qMFiUHNrmJGKjZqcAyjrc,459
 udata/core/site/models.py,sha256=PVB4I2dTQDr5p5md3faVDGZSgOcGKbloHzjzdOG96_I,6266
-udata/core/site/rdf.py,sha256=Z5-tTcxHUoNKZ6PHEerw6fK87nt-gkd_jc9fTNSYwDM,2077
+udata/core/site/rdf.py,sha256=HIuFNA_cvPLmib171GlRAjFZWThbESoOTbK7aj26EMc,2073
 udata/core/spam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spam/api.py,sha256=eqmDB4_VF5EM92675FqFmk4Be5TAnu87dmSVtgXKF4A,1740
 udata/core/spam/constants.py,sha256=dTj0GyPH2zdxhurxva2CGnL-3WwqZETyt5vYQhmVpow,144
@@ -669,7 +669,7 @@ udata/tests/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 udata/tests/organization/test_csv_adapter.py,sha256=vgTVbPMqKipcdg7wi99pHk9ZNhqtuU-yneEaVW3pZmU,1564
 udata/tests/organization/test_notifications.py,sha256=PGmME5BbYVtcPffeSE1sx47J6iAfm4RDAZIRv_MXDFE,1366
 udata/tests/organization/test_organization_model.py,sha256=clRck_ZNSIBI0VaugrInK6dUkw3yBaly6TtVqmLzfEY,3684
-udata/tests/organization/test_organization_rdf.py,sha256=v_gC4BI0hCFKDkK0CMmZO6PBwqe--pc0OLhyftZpQeg,8086
+udata/tests/organization/test_organization_rdf.py,sha256=Uf-OgXV615wLUHfcBTmp9QFuV8VCFmjI4wgvShve-mc,8074
 udata/tests/organization/test_organization_tasks.py,sha256=ehPirwfLqaEcnJ9TLk3jGw3Xh-CVx1WXhvIDFYrT2iQ,2845
 udata/tests/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/reuse/test_reuse_model.py,sha256=Q862yC-kXE2cM8on-2-B7JEeP9rLgAENi9z3OpDvt5M,4530
@@ -682,7 +682,7 @@ udata/tests/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 udata/tests/site/test_site_api.py,sha256=rVvaGFAXVy_HilxpFrifJp-ESjPd-oAfvLd5eq9kwyA,2190
 udata/tests/site/test_site_metrics.py,sha256=d0gohm0sHin5LrjBx6I9Byii-P_WDBSnkx2Bc5jjIr8,2058
 udata/tests/site/test_site_model.py,sha256=zpRg5jrFPUwhGsljlO5lpCrhJLHiHYoNl28AOw5mI4c,1312
-udata/tests/site/test_site_rdf.py,sha256=YESWrKTyk8z8ptVKQtRSXdGD3F6ETx9W5HHZMYRIFyk,12824
+udata/tests/site/test_site_rdf.py,sha256=zlw7leYc7azfrC6JwDjKiy3wixQzTpo-lDOm-Dg_kXw,13092
 udata/tests/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/user/test_user_rdf.py,sha256=BRdv9ivLLUQoImFOuIohDoZAQXMXCruaNJ37siKul5o,1771
 udata/tests/workers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -705,9 +705,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=nGPoTSbeRlpCQGuxoJ7Oa650flpeeh
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=f-tilnngNNBEIQdXmm3GbdaLlvbwG9YLLwhqyRD5Lh4,44871
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=8RL_aEe-0QJdgY-TNMy7bS4z8X9IOK8-C076dxcp3As,28163
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=Cp0bKPeIbuAqvFeoey_9ItQbAHIeiFZPnZLa6A6JNbI,51363
-udata-10.0.2.dev32490.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.2.dev32490.dist-info/METADATA,sha256=pqUbjD3PIbAbihK5fB7HDRNVMExovIU1pL9zxit_p7E,134672
-udata-10.0.2.dev32490.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.2.dev32490.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.2.dev32490.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.2.dev32490.dist-info/RECORD,,
+udata-10.0.2.dev32505.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.2.dev32505.dist-info/METADATA,sha256=VA8U1sXAR08ZJ40ASMID7xKxo_nCUtdLoWSngV4nhdI,134858
+udata-10.0.2.dev32505.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.2.dev32505.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.2.dev32505.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.2.dev32505.dist-info/RECORD,,