mtbls-mhd-integration 0.0.10__tar.gz → 0.0.11__tar.gz
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.
- {mtbls_mhd_integration-0.0.10/mtbls_mhd_integration.egg-info → mtbls_mhd_integration-0.0.11}/PKG-INFO +1 -1
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/__init__.py +1 -1
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/db_metadata_collector.py +5 -2
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/folder_metadata_collector.py +2 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11/mtbls_mhd_integration.egg-info}/PKG-INFO +1 -1
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/pyproject.toml +2 -2
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/LICENSE +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/README.md +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/__init__.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/cli.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/create.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/create_mhd_file.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/validate.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/config.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/convertor_factory.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/__init__.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/__init__.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/builder.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/convertor.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/mtbls_study_schema.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/ms/__init__.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/ms/convertor.py +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls_mhd_integration.egg-info/SOURCES.txt +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls_mhd_integration.egg-info/dependency_links.txt +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls_mhd_integration.egg-info/entry_points.txt +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls_mhd_integration.egg-info/requires.txt +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls_mhd_integration.egg-info/top_level.txt +0 -0
- {mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/setup.cfg +0 -0
|
@@ -266,7 +266,9 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
|
|
|
266
266
|
study_db_metadata.first_private_date = self._get_date_string(
|
|
267
267
|
study["first_private_date"]
|
|
268
268
|
)
|
|
269
|
-
study_db_metadata.submission_date = self.
|
|
269
|
+
study_db_metadata.submission_date = self._get_date_string(
|
|
270
|
+
study["submissiondate"]
|
|
271
|
+
)
|
|
270
272
|
|
|
271
273
|
study_db_metadata.curation_request = CurationRequest.get_from_int(
|
|
272
274
|
study["curation_request"]
|
|
@@ -274,7 +276,7 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
|
|
|
274
276
|
study_db_metadata.first_public_date = self._get_date_string(
|
|
275
277
|
study["first_public_date"]
|
|
276
278
|
)
|
|
277
|
-
study_db_metadata.release_date = self.
|
|
279
|
+
study_db_metadata.release_date = self._get_date_string(study["releasedate"])
|
|
278
280
|
study_db_metadata.update_date = self._get_date_time_string(study["updatedate"])
|
|
279
281
|
study_db_metadata.status_date = self._get_date_time_string(study["status_date"])
|
|
280
282
|
study_db_metadata.submitters = self._create_submitters(submitters)
|
|
@@ -294,6 +296,7 @@ class DbMetadataCollector(AbstractDbMetadataCollector):
|
|
|
294
296
|
study_db_metadata.dataset_license_version.upper(),
|
|
295
297
|
),
|
|
296
298
|
)
|
|
299
|
+
|
|
297
300
|
study_db_metadata.study_category = StudyCategory(study["study_category"])
|
|
298
301
|
study_db_metadata.mhd_model_version = study["mhd_model_version"]
|
|
299
302
|
study_db_metadata.reserved_mhd_accession = study["mhd_accession"] or ""
|
|
@@ -118,6 +118,8 @@ class LocalFolderMetadataCollector(AbstractFolderMetadataCollector):
|
|
|
118
118
|
study_path,
|
|
119
119
|
calculate_data_folder_size: bool = False,
|
|
120
120
|
calculate_metadata_size: bool = False,
|
|
121
|
+
data_files_path: str = "FILES",
|
|
122
|
+
data_files_mapping_folder_name: None | str = None,
|
|
121
123
|
) -> Tuple[Union[None, StudyFolderMetadata], List[GenericMessage]]:
|
|
122
124
|
messages: List[GenericMessage] = []
|
|
123
125
|
study_folder_metadata = StudyFolderMetadata()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "mtbls-mhd-integration"
|
|
3
|
-
version = "0.0.
|
|
3
|
+
version = "0.0.11"
|
|
4
4
|
description = "MetaboLights - MetabolomicsHub Integration"
|
|
5
5
|
authors = [{"name" = "MetaboLights Team", "email" = "metabolights-help@ebi.ac.uk"}]
|
|
6
6
|
license = "Apache-2.0"
|
|
@@ -50,7 +50,7 @@ exclude = ["tests*", "docs*"]
|
|
|
50
50
|
[tool.commitizen]
|
|
51
51
|
name = "cz_conventional_commits"
|
|
52
52
|
version_provider = "uv"
|
|
53
|
-
version = "0.0.
|
|
53
|
+
version = "0.0.113"
|
|
54
54
|
tag_format = "v$major.$minor.$patch"
|
|
55
55
|
version_files = [
|
|
56
56
|
"pyproject.toml:version",
|
|
File without changes
|
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/create_mhd_file.py
RENAMED
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/commands/validate.py
RENAMED
|
File without changes
|
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/convertor_factory.py
RENAMED
|
File without changes
|
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/__init__.py
RENAMED
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/builder.py
RENAMED
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/legacy/convertor.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mtbls_mhd_integration-0.0.10 → mtbls_mhd_integration-0.0.11}/mtbls2mhd/v0_1/ms/convertor.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|