udata 10.5.1.dev36043__py2.py3-none-any.whl → 10.5.1.dev36076__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of udata might be problematic. Click here for more details.
- udata/harvest/backends/dcat.py +2 -3
- udata/harvest/tests/test_dcat_backend.py +2 -2
- udata/settings.py +2 -0
- {udata-10.5.1.dev36043.dist-info → udata-10.5.1.dev36076.dist-info}/METADATA +2 -1
- {udata-10.5.1.dev36043.dist-info → udata-10.5.1.dev36076.dist-info}/RECORD +9 -9
- {udata-10.5.1.dev36043.dist-info → udata-10.5.1.dev36076.dist-info}/LICENSE +0 -0
- {udata-10.5.1.dev36043.dist-info → udata-10.5.1.dev36076.dist-info}/WHEEL +0 -0
- {udata-10.5.1.dev36043.dist-info → udata-10.5.1.dev36076.dist-info}/entry_points.txt +0 -0
- {udata-10.5.1.dev36043.dist-info → udata-10.5.1.dev36076.dist-info}/top_level.txt +0 -0
udata/harvest/backends/dcat.py
CHANGED
|
@@ -344,8 +344,6 @@ class CswIso19139DcatBackend(DcatBackend):
|
|
|
344
344
|
|
|
345
345
|
ISO_SCHEMA = "http://www.isotc211.org/2005/gmd"
|
|
346
346
|
|
|
347
|
-
XSL_URL = "https://raw.githubusercontent.com/datagouv/iso-19139-to-dcat-ap/patch-datagouv/iso-19139-to-dcat-ap.xsl"
|
|
348
|
-
|
|
349
347
|
def walk_graph(self, url: str, fmt: str) -> Generator[tuple[int, Graph], None, None]:
|
|
350
348
|
"""
|
|
351
349
|
Yield all RDF pages as `Graph` from the source
|
|
@@ -355,7 +353,8 @@ class CswIso19139DcatBackend(DcatBackend):
|
|
|
355
353
|
See https://github.com/SEMICeu/iso-19139-to-dcat-ap for more information on the XSLT.
|
|
356
354
|
"""
|
|
357
355
|
# Load XSLT
|
|
358
|
-
|
|
356
|
+
xsl_url = current_app.config["HARVEST_ISO19139_XSL_URL"]
|
|
357
|
+
xsl = ET.fromstring(self.get(xsl_url).content, parser=SAFE_PARSER)
|
|
359
358
|
transform = ET.XSLT(xsl)
|
|
360
359
|
|
|
361
360
|
# Start querying and parsing graph
|
|
@@ -18,7 +18,7 @@ from udata.rdf import DCAT, RDF, namespace_manager
|
|
|
18
18
|
from udata.storage.s3 import get_from_json
|
|
19
19
|
|
|
20
20
|
from .. import actions
|
|
21
|
-
from ..backends.dcat import URIS_TO_REPLACE
|
|
21
|
+
from ..backends.dcat import URIS_TO_REPLACE
|
|
22
22
|
from .factories import HarvestSourceFactory
|
|
23
23
|
|
|
24
24
|
log = logging.getLogger(__name__)
|
|
@@ -886,7 +886,7 @@ class CswIso19139DcatBackendTest:
|
|
|
886
886
|
with open(os.path.join(CSW_DCAT_FILES_DIR, "XSLT.xml"), "r") as f:
|
|
887
887
|
xslt = f.read()
|
|
888
888
|
url = mock_csw_pagination(rmock, "geonetwork/srv/eng/csw.rdf", "geonetwork-iso-page-{}.xml")
|
|
889
|
-
rmock.get(
|
|
889
|
+
rmock.get(current_app.config.get("HARVEST_ISO19139_XSL_URL"), text=xslt)
|
|
890
890
|
org = OrganizationFactory()
|
|
891
891
|
source = HarvestSourceFactory(
|
|
892
892
|
backend="csw-iso-19139",
|
udata/settings.py
CHANGED
|
@@ -281,6 +281,8 @@ class Defaults(object):
|
|
|
281
281
|
HARVEST_GRAPHS_S3_BUCKET = None # If the catalog is bigger than `HARVEST_MAX_CATALOG_SIZE_IN_MONGO` store the graph inside S3 instead of MongoDB
|
|
282
282
|
HARVEST_GRAPHS_S3_FILENAME_PREFIX = "" # Useful to store the graphs inside a subfolder of the bucket. For example by setting `HARVEST_GRAPHS_S3_FILENAME_PREFIX = 'graphs/'`
|
|
283
283
|
|
|
284
|
+
HARVEST_ISO19139_XSL_URL = "https://raw.githubusercontent.com/SEMICeu/iso-19139-to-dcat-ap/refs/heads/geodcat-ap-2.0.0/iso-19139-to-dcat-ap.xsl"
|
|
285
|
+
|
|
284
286
|
# S3 connection details
|
|
285
287
|
S3_URL = None
|
|
286
288
|
S3_ACCESS_KEY_ID = None
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: udata
|
|
3
|
-
Version: 10.5.1.
|
|
3
|
+
Version: 10.5.1.dev36076
|
|
4
4
|
Summary: Open data portal
|
|
5
5
|
Home-page: https://github.com/opendatateam/udata
|
|
6
6
|
Author: Opendata Team
|
|
@@ -142,6 +142,7 @@ It is collectively taken care of by members of the
|
|
|
142
142
|
|
|
143
143
|
## Current (in progress)
|
|
144
144
|
|
|
145
|
+
- Add config entry for ISO-DCAT XSLT URL [#3360](https://github.com/opendatateam/udata/pull/3360)
|
|
145
146
|
- Fix failing to return dataservice in harvest preview because of no ID for URL [#3357](https://github.com/opendatateam/udata/pull/3357/)
|
|
146
147
|
- Fix invalid resource format from harvested RDF records [#3354](https://github.com/opendatateam/udata/pull/3354)
|
|
147
148
|
- Expose `dataset_id` for CommunityResource in /dataset/resource/id [#3258](https://github.com/opendatateam/udata/pull/3258)
|
|
@@ -13,7 +13,7 @@ udata/mail.py,sha256=FMGHcDAjHvk86iDUwBmVXpx3vbAb2c-j5C3BRnh9IYQ,2670
|
|
|
13
13
|
udata/rdf.py,sha256=JmMxwq4fFBrBZQhJ6O9_nEeYUXspPzoZGTyGUD4Nyxs,18348
|
|
14
14
|
udata/routing.py,sha256=E6sE1F74QyOoz5vcgEi-rNEhCegwLfOtBz5I9fWk-pM,7677
|
|
15
15
|
udata/sentry.py,sha256=ekcxqUSqxfM98TtvCsPaOoX5i2l6PEcYt7kb4l3od-Q,3223
|
|
16
|
-
udata/settings.py,sha256=
|
|
16
|
+
udata/settings.py,sha256=DPG8V4Qkqc3jv1evxvEOlxyZH6h0wphKcP-b5D-d8D4,19576
|
|
17
17
|
udata/sitemap.py,sha256=oRRWoPI7ZsFFnUAOqGT1YuXFFKHBe8EcRnUCNHD7xjM,979
|
|
18
18
|
udata/tags.py,sha256=ydq4uokd6bzdeGVSpEXASVtGvDfO2LfQs9mptvvKJCM,631
|
|
19
19
|
udata/tasks.py,sha256=yTYBJG5bzEChX27p3MSqurSji84rg7w7OUvK4vuPRfY,5080
|
|
@@ -298,7 +298,7 @@ udata/harvest/signals.py,sha256=3AhFHMPIFH5vz01NX5ycR_RWH14MXFWnCT6__LSa-QI,1338
|
|
|
298
298
|
udata/harvest/tasks.py,sha256=ddJtvE0s-kAYt27-rKH6n8U8vKD8qKczlJtdBJzMUns,1718
|
|
299
299
|
udata/harvest/backends/__init__.py,sha256=QjoFfBJfpw_xgk5YYWI1SgKJOMEmTMlxSfW79GNkSTI,459
|
|
300
300
|
udata/harvest/backends/base.py,sha256=2wyfw83e3xGQcHnQI-z26g1dg-uVtWcDgzsBk7iGX3Y,17480
|
|
301
|
-
udata/harvest/backends/dcat.py,sha256=
|
|
301
|
+
udata/harvest/backends/dcat.py,sha256=IfUmqHy68Tt30E_kn4riExfgb-d7qPa--7KjCLCsia0,18637
|
|
302
302
|
udata/harvest/backends/maaf.py,sha256=N7ty8ZWO9pfKPtZRk1wTaJ5pY6qi-0-GtF1p8jiYiY4,8102
|
|
303
303
|
udata/harvest/backends/maaf.xsd,sha256=vEyG8Vqw7Yn_acjRdXjqUJgxOj4pv8bibep-FX-f3BQ,18322
|
|
304
304
|
udata/harvest/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -307,7 +307,7 @@ udata/harvest/tests/person.jsonld,sha256=I7Ynh-PQlNeD51I1LrCgYOEjhL-WBeb65xzIE_s
|
|
|
307
307
|
udata/harvest/tests/test_actions.py,sha256=Hm5MpOEFXBvFzcNMu7hvrWIiP6fiOXLuDOyrykL-4tc,25224
|
|
308
308
|
udata/harvest/tests/test_api.py,sha256=dyCXhKgOO0XmCPgH_36sob8WVhtMB2WX1johbfzJtDI,21553
|
|
309
309
|
udata/harvest/tests/test_base_backend.py,sha256=ow8ecGtD836mUqyPWYjkS5nx0STyT5RMLgBdDyOhts4,19233
|
|
310
|
-
udata/harvest/tests/test_dcat_backend.py,sha256=
|
|
310
|
+
udata/harvest/tests/test_dcat_backend.py,sha256=DCRtA0DDW7XrX7ux7GI6HaUcI-ZOWIoGe8Dl2pwGCo4,43713
|
|
311
311
|
udata/harvest/tests/test_filters.py,sha256=PT2qopEIoXsqi8MsNDRuhNH7jGXiQo8r0uJrCOUd4aM,2465
|
|
312
312
|
udata/harvest/tests/test_models.py,sha256=f9NRR2_S4oZFgF8qOumg0vv-lpnEBJbI5vNtcwFdSqM,831
|
|
313
313
|
udata/harvest/tests/test_notifications.py,sha256=MMzTzkv-GXMNFeOwAi31rdTsAXyLCLOSna41zOtaJG0,816
|
|
@@ -736,9 +736,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=9sCd1MUKvtVP_sOXvK-G5v4PfWkkdA
|
|
|
736
736
|
udata/translations/pt/LC_MESSAGES/udata.po,sha256=-eJptz9s63rjkdm-3HJi_2t70pyv3-8EuXBn-B2qI_4,48419
|
|
737
737
|
udata/translations/sr/LC_MESSAGES/udata.mo,sha256=qduXntHWe__KaUxJ4JwwyGG3eSgYb1auGdNax0lS49c,29169
|
|
738
738
|
udata/translations/sr/LC_MESSAGES/udata.po,sha256=6QCuLMCRjgyAvu9U7i0P19ae8fm_uStfmxHLqUO9EoY,55394
|
|
739
|
-
udata-10.5.1.
|
|
740
|
-
udata-10.5.1.
|
|
741
|
-
udata-10.5.1.
|
|
742
|
-
udata-10.5.1.
|
|
743
|
-
udata-10.5.1.
|
|
744
|
-
udata-10.5.1.
|
|
739
|
+
udata-10.5.1.dev36076.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
|
|
740
|
+
udata-10.5.1.dev36076.dist-info/METADATA,sha256=7diG5zHyeuMPGlb1wYgvigaapy8Di8PQ_JYTRP4Eb5c,149934
|
|
741
|
+
udata-10.5.1.dev36076.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
|
|
742
|
+
udata-10.5.1.dev36076.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
|
|
743
|
+
udata-10.5.1.dev36076.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
|
|
744
|
+
udata-10.5.1.dev36076.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|