diff --git a/ckanext/dcat/tests/profiles/dcat_ap_2/test_multilingual_support.py b/ckanext/dcat/tests/profiles/dcat_ap_2/test_multilingual_support.py index 55f50a4d..4cda5fc0 100644 --- a/ckanext/dcat/tests/profiles/dcat_ap_2/test_multilingual_support.py +++ b/ckanext/dcat/tests/profiles/dcat_ap_2/test_multilingual_support.py @@ -27,10 +27,6 @@ @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_multilingual.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml ckanext.fluent:presets.json", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) diff --git a/ckanext/dcat/tests/profiles/dcat_ap_2/test_scheming_support.py b/ckanext/dcat/tests/profiles/dcat_ap_2/test_scheming_support.py index ed0245a2..3837201d 100644 --- a/ckanext/dcat/tests/profiles/dcat_ap_2/test_scheming_support.py +++ b/ckanext/dcat/tests/profiles/dcat_ap_2/test_scheming_support.py @@ -35,10 +35,6 @@ @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) @@ -608,10 +604,6 @@ def test_dcat_date(self): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) @@ -640,10 +632,6 @@ def test_mimetype_is_guessed(self): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) @@ -844,10 +832,6 @@ def test_statement_literal(self): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) diff --git a/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_parse.py b/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_parse.py index e887a24d..bfeb784a 100644 --- a/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_parse.py +++ b/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_parse.py @@ -11,10 +11,6 @@ @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config("ckanext.dcat.rdf.profiles", "euro_dcat_ap_3") class TestSchemingParseSupport(BaseParseTest): def test_e2e_dcat_to_ckan(self): diff --git a/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_serialize.py b/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_serialize.py index c3a82d33..9d323f5c 100644 --- a/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_serialize.py +++ b/ckanext/dcat/tests/profiles/dcat_ap_3/test_euro_dcatap_3_profile_serialize.py @@ -36,10 +36,6 @@ class TestEuroDCATAP3ProfileSerializeDataset(BaseSerializeTest): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) - @pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", - ) @pytest.mark.ckan_config("ckanext.dcat.rdf.profiles", "euro_dcat_ap_3") def test_e2e_ckan_to_dcat(self): """ diff --git a/ckanext/dcat/tests/shacl/test_shacl.py b/ckanext/dcat/tests/shacl/test_shacl.py index 5455ae3e..132b4fe9 100644 --- a/ckanext/dcat/tests/shacl/test_shacl.py +++ b/ckanext/dcat/tests/shacl/test_shacl.py @@ -51,10 +51,6 @@ def _results_count(results_graph): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) @@ -75,10 +71,6 @@ def test_validate_dcat_ap_2_graph_shapes(): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) @@ -129,10 +121,6 @@ def test_validate_dcat_ap_2_legacy_graph_shapes_recommended(): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config( "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming" ) @@ -169,10 +157,6 @@ def test_validate_dcat_ap_2_graph_shapes_range(): @pytest.mark.ckan_config( "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_full.yaml" ) -@pytest.mark.ckan_config( - "scheming.presets", - "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml", -) @pytest.mark.ckan_config("ckanext.dcat.rdf.profiles", "euro_dcat_ap_3") def test_validate_dcat_ap_3_graph(): diff --git a/test.ini b/test.ini index 529eebc4..afab9137 100644 --- a/test.ini +++ b/test.ini @@ -17,6 +17,10 @@ ckanext.dcat.enable_content_negotiation=True ckan.activity_streams_enabled = false ckan.harvest.mq.type = redis +# Needed here because of https://github.com/ckan/ckanext-scheming/issues/424 +scheming.presets = ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml ckanext.fluent:presets.json + + # Logging configuration [loggers] keys = root, ckan, sqlalchemy