nci-cidc-schemas 0.26.32__tar.gz → 0.26.33__tar.gz

{nci_cidc_schemas-0.26.32/nci_cidc_schemas.egg-info → nci_cidc_schemas-0.26.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nci_cidc_schemas
-Version: 0.26.32
+Version: 0.26.33
 Summary: The CIDC data model and tools for working with it.
 Home-page: https://github.com/NCI-CIDC/cidc-schemas
 Author: NCI

{nci_cidc_schemas-0.26.32 → nci_cidc_schemas-0.26.33}/cidc_schemas/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """NCI"""
 __email__ = "nci-cidc-tools-admin@mail.nih.gov"
-__version__ = "0.26.32"
+__version__ = "0.26.33"

{nci_cidc_schemas-0.26.32 → nci_cidc_schemas-0.26.33}/cidc_schemas/schemas/templates/assays/ctdna_template.json

@@ -97,19 +97,22 @@
                 "merge_pointer": "0/on_premise_corrected_depth_file",
                 "type_ref": "assays/components/local_file.json#properties/file_path",
                 "is_artifact": 1,
-                "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.correctedDepth.txt"
+                "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.correctedDepth.txt",
+                "allow_empty": true
             },
             "on premise parameters file": {
                 "merge_pointer": "0/on_premise_parameters_file",
                 "type_ref": "assays/components/local_file.json#properties/file_path",
                 "is_artifact": 1,
-                "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.params.txt"
+                "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.params.txt",
+                "allow_empty": true
             },
             "on premise rdata file": {
                 "merge_pointer": "0/on_premise_rdata_file",
                 "type_ref": "assays/components/local_file.json#properties/file_path",
                 "is_artifact": 1,
-                "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.RData"
+                "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.RData",
+                "allow_empty": true
             },
             "comments": {
                 "type_ref": "assays/ctdna_assay.json#definitions/entry/properties/comments",

{nci_cidc_schemas-0.26.32 → nci_cidc_schemas-0.26.33/nci_cidc_schemas.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nci_cidc_schemas
-Version: 0.26.32
+Version: 0.26.33
 Summary: The CIDC data model and tools for working with it.
 Home-page: https://github.com/NCI-CIDC/cidc-schemas
 Author: NCI

{nci_cidc_schemas-0.26.32 → nci_cidc_schemas-0.26.33}/tests/prism/cidc_test_data/assay_data.py

@@ -3531,15 +3531,6 @@ def ctdna() -> PrismTestData:
                             "other_solutions": {
                                 "upload_placeholder": "f63988e4-948d-4d55-8822-600754d5259c"
                             },
-                            "on_premise_corrected_depth_file": {
-                                "upload_placeholder": "4c409c82-dff7-4f78-801c-1222"
-                            },
-                            "on_premise_parameters_file": {
-                                "upload_placeholder": "4c409c82-dff7-4f78-801c-111"
-                            },
-                            "on_premise_rdata_file": {
-                                "upload_placeholder": "4c409c82-dff7-4f78-801c-323fff"
-                            },
                             "fraction_cna_subclonal": 0.2,
                             "fraction_genome_subclonal": 0.3,
                             "gc_map_correction_mad": 0.05,
@@ -3603,13 +3594,6 @@ def ctdna() -> PrismTestData:
             metadata_availability=False,
             allow_empty=False,
         ),
-        LocalFileUploadEntry(
-            local_path="CTTTPP121.00/OnPrem.correctedDepth.txt",
-            upload_placeholder="4c409c82-dff7-4f78-801c-1222",
-            gs_key="test_prism_trial_id/ctdna/test_batch/CTTTPP121.00/OnPrem.correctedDepth.txt",
-            metadata_availability=False,
-            allow_empty=False,
-        ),
         LocalFileUploadEntry(
             local_path="CTTTPP111.00/OnPrem.params.txt",
             upload_placeholder="4c409c82-dff7-4f78-801c-33ssf",
@@ -3617,13 +3601,6 @@ def ctdna() -> PrismTestData:
             metadata_availability=False,
             allow_empty=False,
         ),
-        LocalFileUploadEntry(
-            local_path="CTTTPP121.00/OnPrem.params.txt",
-            upload_placeholder="4c409c82-dff7-4f78-801c-111",
-            gs_key="test_prism_trial_id/ctdna/test_batch/CTTTPP121.00/OnPrem.params.txt",
-            metadata_availability=False,
-            allow_empty=False,
-        ),
         LocalFileUploadEntry(
             local_path="CTTTPP111.00/OnPrem.RData",
             upload_placeholder="4c409c82-dff7-4f78-801c-222ssff",
@@ -3631,13 +3608,6 @@ def ctdna() -> PrismTestData:
             metadata_availability=False,
             allow_empty=False,
         ),
-        LocalFileUploadEntry(
-            local_path="CTTTPP121.00/OnPrem.RData",
-            upload_placeholder="4c409c82-dff7-4f78-801c-323fff",
-            gs_key="test_prism_trial_id/ctdna/test_batch/CTTTPP121.00/OnPrem.RData",
-            metadata_availability=False,
-            allow_empty=False,
-        ),
         LocalFileUploadEntry(
             local_path="CTTTPP121_00.bam",
             upload_placeholder="189068fe-4c00-4a67-9a98-74223266c1e0",