Merge branch 'master' into dcat-ap-3

ckan · Aug 27, 2024 · 6ceb79b · 6ceb79b
2 parents c8b87f3 + 2ed0841
commit 6ceb79b
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 6 deletions.
diff --git a/ckanext/dcat/tests/harvester/__init__.py b/ckanext/dcat/tests/harvester/__init__.py
diff --git a/ckanext/dcat/tests/test_harvester.py → ...xt/dcat/tests/harvester/test_harvester.py b/ckanext/dcat/tests/test_harvester.py → ...xt/dcat/tests/harvester/test_harvester.py
diff --git a/ckanext/dcat/tests/test_json_harvester.py → ...at/tests/harvester/test_json_harvester.py b/ckanext/dcat/tests/test_json_harvester.py → ...at/tests/harvester/test_json_harvester.py
diff --git a/ckanext/dcat/tests/test_logic.py → ckanext/dcat/tests/logic/test_logic.py b/ckanext/dcat/tests/test_logic.py → ckanext/dcat/tests/logic/test_logic.py
diff --git a/ckanext/dcat/tests/test_validators.py → ckanext/dcat/tests/logic/test_validators.py b/ckanext/dcat/tests/test_validators.py → ckanext/dcat/tests/logic/test_validators.py
diff --git a/ckanext/dcat/tests/profiles/__init__.py b/ckanext/dcat/tests/profiles/__init__.py
diff --git a/ckanext/dcat/tests/profiles/base/__init__.py b/ckanext/dcat/tests/profiles/base/__init__.py
diff --git a/ckanext/dcat/tests/test_base_parser.py → ...t/tests/profiles/base/test_base_parser.py b/ckanext/dcat/tests/test_base_parser.py → ...t/tests/profiles/base/test_base_parser.py
diff --git a/ckanext/dcat/tests/test_base_profile.py → .../tests/profiles/base/test_base_profile.py b/ckanext/dcat/tests/test_base_profile.py → .../tests/profiles/base/test_base_profile.py
@@ -8,7 +8,7 @@
 
 from ckanext.dcat.profiles import RDFProfile, CleanedURIRef
 
-from ckanext.dcat.tests.test_base_parser import _default_graph
+from ckanext.dcat.tests.profiles.base.test_base_parser import _default_graph
 
 
 DCT = Namespace("http://purl.org/dc/terms/")

diff --git a/ckanext/dcat/tests/test_base_serializer.py → ...sts/profiles/base/test_base_serializer.py b/ckanext/dcat/tests/test_base_serializer.py → ...sts/profiles/base/test_base_serializer.py
diff --git a/ckanext/dcat/tests/profiles/dcat_ap/__init__.py b/ckanext/dcat/tests/profiles/dcat_ap/__init__.py
diff --git a/...t/tests/test_euro_dcatap_profile_parse.py → ...dcat_ap/test_euro_dcatap_profile_parse.py b/...t/tests/test_euro_dcatap_profile_parse.py → ...dcat_ap/test_euro_dcatap_profile_parse.py
diff --git a/...sts/test_euro_dcatap_profile_serialize.py → ..._ap/test_euro_dcatap_profile_serialize.py b/...sts/test_euro_dcatap_profile_serialize.py → ..._ap/test_euro_dcatap_profile_serialize.py
diff --git a/ckanext/dcat/tests/profiles/dcat_ap_2/__init__.py b/ckanext/dcat/tests/profiles/dcat_ap_2/__init__.py
diff --git a/...tests/test_euro_dcatap_2_profile_parse.py → ..._ap_2/test_euro_dcatap_2_profile_parse.py b/...tests/test_euro_dcatap_2_profile_parse.py → ..._ap_2/test_euro_dcatap_2_profile_parse.py
diff --git a/...s/test_euro_dcatap_2_profile_serialize.py → ...2/test_euro_dcatap_2_profile_serialize.py b/...s/test_euro_dcatap_2_profile_serialize.py → ...2/test_euro_dcatap_2_profile_serialize.py
diff --git a/ckanext/dcat/tests/test_scheming_support.py → ...ofiles/dcat_ap_2/test_scheming_support.py b/ckanext/dcat/tests/test_scheming_support.py → ...ofiles/dcat_ap_2/test_scheming_support.py
diff --git a/ckanext/dcat/tests/profiles/dcat_ap_3/__init__.py b/ckanext/dcat/tests/profiles/dcat_ap_3/__init__.py
diff --git a/ckanext/dcat/tests/profiles/schemaorg/__init__.py b/ckanext/dcat/tests/profiles/schemaorg/__init__.py
diff --git a/...tests/test_schemaorg_profile_serialize.py → ...maorg/test_schemaorg_profile_serialize.py b/...tests/test_schemaorg_profile_serialize.py → ...maorg/test_schemaorg_profile_serialize.py
@@ -15,7 +15,7 @@
 from ckanext.dcat.processors import RDFSerializer
 from ckanext.dcat.profiles import SCHEMA
 
-from ckanext.dcat.tests.test_euro_dcatap_profile_serialize import BaseSerializeTest
+from ckanext.dcat.tests.profiles.dcat_ap.test_euro_dcatap_profile_serialize import BaseSerializeTest
 
 
 class TestSchemaOrgProfileSerializeDataset(BaseSerializeTest):

diff --git a/ckanext/dcat/tests/test_shacl.py → ckanext/dcat/tests/shacl/test_shacl.py b/ckanext/dcat/tests/test_shacl.py → ckanext/dcat/tests/shacl/test_shacl.py
@@ -12,7 +12,7 @@
 
 
 def _get_shacl_file_path(file_name):
-    return os.path.join(os.path.dirname(__file__), "shacl", file_name)
+    return os.path.join(os.path.dirname(__file__), file_name)
 
 
 generated_graphs = {}

diff --git a/setup.py b/setup.py
@@ -36,9 +36,9 @@
     structured_data=ckanext.dcat.plugins:StructuredDataPlugin
 
     # Test plugins
-    test_rdf_harvester=ckanext.dcat.tests.test_harvester:TestRDFHarvester
-    test_rdf_null_harvester=ckanext.dcat.tests.test_harvester:TestRDFNullHarvester
-    test_rdf_exception_harvester=ckanext.dcat.tests.test_harvester:TestRDFExceptionHarvester
+    test_rdf_harvester=ckanext.dcat.tests.harvester.test_harvester:TestRDFHarvester
+    test_rdf_null_harvester=ckanext.dcat.tests.harvester.test_harvester:TestRDFNullHarvester
+    test_rdf_exception_harvester=ckanext.dcat.tests.harvester.test_harvester:TestRDFExceptionHarvester
 
     [ckan.rdf.profiles]
     euro_dcat_ap=ckanext.dcat.profiles:EuropeanDCATAPProfile