move data models to their own folder

Author: andrewelamb

tests/unit/synapseclient/extensions/conftest.py

@@ -61,7 +61,7 @@ def helpers():
 @pytest.fixture(name="dmge", scope="function")
 def DMGE(helpers: Helpers) -> DataModelGraphExplorer:
     """Fixture to instantiate a DataModelGraphExplorer object using the data model with column types"""
-    dmge = helpers.get_data_model_graph_explorer(path="example.model.csv")
+    dmge = helpers.get_data_model_graph_explorer(path="data_models/example.model.csv")
     return dmge
 
 
@@ -74,15 +74,15 @@ def fixture_dmr():
 @pytest.fixture(name="dmp")
 def fixture_dmp(helpers: Helpers) -> DataModelParser:
     "Returns a DataModelParser using the csv data model"
-    data_model_path = helpers.get_schema_file_path("example.model.csv")
+    data_model_path = helpers.get_schema_file_path("data_models/example.model.csv")
     dmp = DataModelParser(data_model_path, logger=Mock())
     return dmp
 
 
 @pytest.fixture(name="dmp_jsonld")
 def fixture_dmp_json_ld(helpers: Helpers) -> DataModelParser:
     "Returns a DataModelParser using the jsonld data model"
-    data_model_path = helpers.get_schema_file_path("example.model.jsonld")
+    data_model_path = helpers.get_schema_file_path("data_models/example.model.jsonld")
     dmp = DataModelParser(data_model_path, logger=Mock())
     return dmp
 

…xtensions/schema_files/example.model.csv …hema_files/data_models/example.model.csvtests/unit/synapseclient/extensions/schema_files/example.model.csv renamed to tests/unit/synapseclient/extensions/schema_files/data_models/example.model.csv tests/unit/synapseclient/extensions/schema_files/example.model.csv renamed to tests/unit/synapseclient/extensions/schema_files/data_models/example.model.csv

@@ -1731,7 +1731,7 @@ def setUp(self):
         self.test_schema_path = os.path.join(
             os.path.dirname(__file__),
             "schema_files",
-            "example.model.csv",
+            "data_models/example.model.csv",
         )
 
     def test_generate_jsonld_with_default_output_path(self):
@@ -1945,7 +1945,7 @@ def setUp(self):
         self.test_schema_path = os.path.join(
             os.path.dirname(__file__),
             "schema_files",
-            "example.model.csv",
+            "data_models/example.model.csv",
         )
 
     def test_generate_jsonschema_from_csv(self):

…nsions/schema_files/example.model.jsonld …a_files/data_models/example.model.jsonldtests/unit/synapseclient/extensions/schema_files/example.model.jsonld renamed to tests/unit/synapseclient/extensions/schema_files/data_models/example.model.jsonld tests/unit/synapseclient/extensions/schema_files/example.model.jsonld renamed to tests/unit/synapseclient/extensions/schema_files/data_models/example.model.jsonld

@@ -6,7 +6,7 @@
     AtomicColumnType,
     ColumnType,
     DataModelGraphExplorer,
-    Format,
+    JSONSchemaFormat,
     ListColumnType,
 )
 
@@ -71,9 +71,9 @@ def test_get_node_column_type(
 
 @pytest.mark.parametrize(
     "node_label, column_type",
-    [("String", None), ("Date", Format.DATE), ("URL", Format.URI)],
+    [("String", None), ("Date", JSONSchemaFormat.DATE), ("URL", JSONSchemaFormat.URI)],
 )
 def test_get_node_format(
-    dmge: DataModelGraphExplorer, node_label: str, column_type: Format
+    dmge: DataModelGraphExplorer, node_label: str, column_type: JSONSchemaFormat
 ) -> None:
     assert dmge.get_node_format(node_label) == column_type

tests/unit/synapseclient/extensions/unit_test_curator.py

@@ -38,7 +38,9 @@ def test_gather_csv_attributes_relationships(
         self, helpers, csv_dmp: DataModelCSVParser
     ):
         """The output of the function is a attributes relationship dictionary, check that it is formatted properly."""
-        path_to_data_model = helpers.get_schema_file_path("example.model.csv")
+        path_to_data_model = helpers.get_schema_file_path(
+            "data_models/example.model.csv"
+        )
         model_df = load_df(path_to_data_model, data_model=True)
 
         attr_rel_dict = csv_dmp.gather_csv_attributes_relationships(model_df=model_df)
@@ -52,7 +54,9 @@ def test_gather_csv_attributes_relationships(
 
     def test_parse_csv_model(self, helpers, csv_dmp: DataModelCSVParser):
         """The output of the function is a attributes relationship dictionary, check that it is formatted properly."""
-        path_to_data_model = helpers.get_schema_file_path("example.model.csv")
+        path_to_data_model = helpers.get_schema_file_path(
+            "data_models/example.model.csv"
+        )
 
         attr_rel_dictionary = csv_dmp.parse_csv_model(
             path_to_data_model=path_to_data_model
@@ -91,7 +95,9 @@ def test_gather_jsonld_attributes_relationships(
         jsonld_dmp: DataModelJSONLDParser,
     ):
         """The output of the function is a attributes relationship dictionary, check that it is formatted properly."""
-        path_to_data_model = helpers.get_schema_file_path("example.model.jsonld")
+        path_to_data_model = helpers.get_schema_file_path(
+            "data_models/example.model.jsonld"
+        )
         model_jsonld = load_json(path_to_data_model)
         attr_rel_dict = jsonld_dmp.gather_jsonld_attributes_relationships(
             model_jsonld=model_jsonld["@graph"],
@@ -110,7 +116,9 @@ def test_parse_jsonld_model(
         jsonld_dmp: DataModelJSONLDParser,
     ):
         """The output of the function is a attributes relationship dictionary, check that it is formatted properly."""
-        path_to_data_model = helpers.get_schema_file_path("example.model.jsonld")
+        path_to_data_model = helpers.get_schema_file_path(
+            "data_models/example.model.jsonld"
+        )
         attr_rel_dictionary = jsonld_dmp.parse_jsonld_model(
             path_to_data_model=path_to_data_model,
         )