diff --git a/changes/.gitkeep b/changes/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/changes/405.changed b/changes/405.changed new file mode 100644 index 00000000..42351570 --- /dev/null +++ b/changes/405.changed @@ -0,0 +1 @@ +- BREAKING: Remove `type` from `DatasetSpec` ([#405](https://github.com/Substra/substra/pull/405)) \ No newline at end of file diff --git a/references/sdk_models.md b/references/sdk_models.md index a3341954..07b326ae 100644 --- a/references/sdk_models.md +++ b/references/sdk_models.md @@ -31,7 +31,6 @@ Dataset asset - name: - owner: - permissions: -- type: - data_sample_keys: typing.List[str] - opener: - description: diff --git a/references/sdk_schemas.md b/references/sdk_schemas.md index fdf57509..3df140a0 100644 --- a/references/sdk_schemas.md +++ b/references/sdk_schemas.md @@ -36,7 +36,6 @@ note : metadata field does not accept strings containing '__' as dict key ```text - name: - data_opener: -- type: - description: - permissions: - metadata: typing.Optional[typing.Dict[str, str]] diff --git a/substra/sdk/backends/local/backend.py b/substra/sdk/backends/local/backend.py index c52d64ec..273f7c33 100644 --- a/substra/sdk/backends/local/backend.py +++ b/substra/sdk/backends/local/backend.py @@ -324,7 +324,6 @@ def _add_dataset(self, key, spec, spec_options=None): "authorized_ids": permissions.authorized_ids, }, }, - type=spec.type, data_sample_keys=[], opener={"checksum": fs.hash_file(dataset_file_path), "storage_address": dataset_file_path}, description={ diff --git a/substra/sdk/models.py b/substra/sdk/models.py index 40f84ab5..ea16efdb 100644 --- a/substra/sdk/models.py +++ b/substra/sdk/models.py @@ -150,7 +150,6 @@ class Dataset(_Model): name: str owner: str permissions: Permissions - type: str data_sample_keys: List[str] = [] opener: _File description: _File diff --git a/substra/sdk/schemas.py b/substra/sdk/schemas.py index 06683e7b..6d5c3a01 100644 --- a/substra/sdk/schemas.py +++ b/substra/sdk/schemas.py @@ -282,7 +282,6 @@ class DatasetSpec(_Spec): name: str data_opener: pathlib.Path # Path to the data opener - type: str description: pathlib.Path # Path to the description file permissions: Permissions metadata: Optional[Dict[str, str]] = None diff --git a/tests/conftest.py b/tests/conftest.py index 522a7b4e..828a3991 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -40,7 +40,6 @@ def dataset_query(tmpdir): return { "name": "dataset_name", "data_opener": str(opener_path), - "type": "images", "description": str(desc_path), "permissions": { "public": True, diff --git a/tests/data_factory.py b/tests/data_factory.py index 9f72594a..34fc0f8d 100644 --- a/tests/data_factory.py +++ b/tests/data_factory.py @@ -362,7 +362,6 @@ def create_dataset(self, permissions=None, metadata=None, py_script=None, logs_p return substra.sdk.schemas.DatasetSpec( name=name, data_opener=str(opener_path), - type="Test", metadata=metadata, description=str(description_path), permissions=permissions or DEFAULT_PERMISSIONS, diff --git a/tests/datastore.py b/tests/datastore.py index c78f248b..fc0a07e4 100644 --- a/tests/datastore.py +++ b/tests/datastore.py @@ -33,7 +33,6 @@ "process": {"public": True, "authorized_ids": ["MyOrg1MSP"]}, "download": {"public": True, "authorized_ids": ["MyOrg1MSP"]}, }, - "type": "Test", "data_sample_keys": [], "metadata": {"foo": "bar"}, "opener": {