nci-cidc-schemas 0.27.25__py2.py3-none-any.whl → 0.27.27__py2.py3-none-any.whl

cidc_schemas/__init__.py

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

cidc_schemas/prism/extra_metadata.py

@@ -131,7 +131,7 @@ def parse_npx(xlsx: BinaryIO) -> dict:
 
                 # otherwise get the identifier
                 # and check that it is a CIMAC ID
-                if cimac_id_regex.match(first_cell):
+                if cimac_id_regex.match(first_cell) and first_cell not in ids:
                     ids.append(first_cell)
 
     sample_count = len(ids)

cidc_schemas/schemas/templates/assays/scrnaseq_template.json

@@ -76,7 +76,7 @@
                         "Read 2": {
                             "merge_pointer": "0/details/read_2_file",
                             "is_artifact": 1,
-                            "gcs_uri_format": "{protocol identifier}/scrnaseq/{batch id}/{cimac id}/read_1.gz",
+                            "gcs_uri_format": "{protocol identifier}/scrnaseq/{batch id}/{cimac id}/read_2.gz",
                             "type_ref": "assays/components/local_file.json#properties/file_path"
                         },
                         "library yield ng": {

{nci_cidc_schemas-0.27.25.dist-info → nci_cidc_schemas-0.27.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_schemas
-Version: 0.27.25
+Version: 0.27.27
 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.27.25.dist-info → nci_cidc_schemas-0.27.27.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cidc_schemas/__init__.py,sha256=E3VX0BIuWNI80Finvf9Ido79vmjwxN7dTo9aTJSsGD8,136
+cidc_schemas/__init__.py,sha256=LzCxsxeBVy_w57xsTTGde82YzIm7FKoErArY-_xeGW4,136
 cidc_schemas/cli.py,sha256=gWiktRlraNH8Q0zNUae9dohKjPwBmcY0BJwdcQ_fIic,4099
 cidc_schemas/constants.py,sha256=RULs7pGuBAVq1teXymrfbVsK23ZowJvLuZlv0KcjL-Y,698
 cidc_schemas/json_validation.py,sha256=spmPsqinib7Ns5GvWOKKa1rc7IrN_s2bqifpTKdaLVU,23288
@@ -13,7 +13,7 @@ cidc_schemas/pipeline_configs/rna_level1_analysis_config.yaml.j2,sha256=6no9sFqw
 cidc_schemas/prism/__init__.py,sha256=J5Tj0X7Di6cyxAjaduOUp2aVyvl8UI67bgxEkgttvcU,530
 cidc_schemas/prism/constants.py,sha256=PevSn-geY8VTGMx1iXdUJ2LgoeuhEdKfIpZYk_LbzwI,4088
 cidc_schemas/prism/core.py,sha256=tXDCCHurvcrxfU11meH3NRAVo9niklup0dpLRoIXwPk,20242
-cidc_schemas/prism/extra_metadata.py,sha256=S9w5EGAT0xwaWMrpYluF7Y1ONsI4wFtxFD8ib6Va_fU,8567
+cidc_schemas/prism/extra_metadata.py,sha256=lZnuFy-UFulJ4QugAfEG7UbjXCOSi2wHLQnWtPCX__U,8593
 cidc_schemas/prism/merger.py,sha256=36CKBPVoWecHuvGp3oT9a2d4jWIkvKuS_UofKTEpMYs,13065
 cidc_schemas/prism/pipelines.py,sha256=dvZtoC7pEVgdPual_DZUTBFfgvSV7yTdk1RHwi5h6Vs,33522
 cidc_schemas/schemas/aliquot.json,sha256=F24s6xGTeJl-VT6s6wvV8YtMA4O-0BsUCwtD2OEx_cY,1943
@@ -162,7 +162,7 @@ cidc_schemas/schemas/templates/assays/nanostring_template.json,sha256=XFbf72EHNs
 cidc_schemas/schemas/templates/assays/olink_template.json,sha256=3YqkeVF9PnXUeETkf0RfEB14jprNPMWWwY4GTALfuWY,6335
 cidc_schemas/schemas/templates/assays/rna_bam_template.json,sha256=l2OLgb8hx3fAupUvdWWtn_QbOiyicYE2u4diVz7C5cg,3084
 cidc_schemas/schemas/templates/assays/rna_fastq_template.json,sha256=ZSKfzQ38SkpeKTK-xT9YAz0tRafCjo-IUZsr8GBYLOM,3344
-cidc_schemas/schemas/templates/assays/scrnaseq_template.json,sha256=H_xU32U-1S7HCqZanaSqWb6KJ97jMQIBjwO_zsxDsfg,4843
+cidc_schemas/schemas/templates/assays/scrnaseq_template.json,sha256=GnH-hh644YkYDghidCMAqNA-k6OMk_snNU1P8625w6M,4843
 cidc_schemas/schemas/templates/assays/tcr_adaptive_template.json,sha256=Hb8ngxw6XHjIqtA9W1eLfO3ciH18VfRTKOQvipX14Dg,3269
 cidc_schemas/schemas/templates/assays/tcr_fastq_template.json,sha256=7Qq4ssI8ErDrHy5RIxjPcNiDf2IBHG42JcngDFKxqlE,3457
 cidc_schemas/schemas/templates/assays/visium_template.json,sha256=H_UhJBGxPyGWq4HSPsn4SpKMmb3xTC1e5DMz3XlXAu4,7898
@@ -178,9 +178,9 @@ cidc_schemas/schemas/templates/manifests/tissue_slide_template.json,sha256=q2GmO
 cidc_schemas/schemas/templates/manifests/tumor_normal_pairing_template.json,sha256=lVJrGb28n-vyfjGBzhrzjn1lMKw1b4HXXmWtwA603v0,2797
 cidc_schemas/schemas/templates/manifests/tumor_tissue_dna_template.json,sha256=LpaoDXDS11NCa-Dv37N-tzEGomswQrx5fypkUcG7xJk,18956
 cidc_schemas/schemas/templates/manifests/tumor_tissue_rna_template.json,sha256=-gww6NCHbtbI5z7UmNSmKyPK3IqKCE8F6n4XwTAb_gk,18101
-nci_cidc_schemas-0.27.25.dist-info/licenses/LICENSE,sha256=zK77-w4rYCZBHAYJEGkcFuPXwKIsP7jMPZ2iQOXjzko,1072
-nci_cidc_schemas-0.27.25.dist-info/METADATA,sha256=xCoEcw3HaDx-qsS0jKMs9sgx2oWIgu5VY-4-PyWhngo,4554
-nci_cidc_schemas-0.27.25.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-nci_cidc_schemas-0.27.25.dist-info/entry_points.txt,sha256=kSyTzXeJQrJp_2ZX0GS_NnbJR8ceQKLBSgER46PM0hs,55
-nci_cidc_schemas-0.27.25.dist-info/top_level.txt,sha256=Wwb5Cu7QrnbmSJxI2d00e3-Mir36t0jTRnSulmfhi30,13
-nci_cidc_schemas-0.27.25.dist-info/RECORD,,
+nci_cidc_schemas-0.27.27.dist-info/licenses/LICENSE,sha256=zK77-w4rYCZBHAYJEGkcFuPXwKIsP7jMPZ2iQOXjzko,1072
+nci_cidc_schemas-0.27.27.dist-info/METADATA,sha256=HMgpbCIIfPcPd8T3Vhv53S3WV4iFLkv9NzxwylK5H3U,4554
+nci_cidc_schemas-0.27.27.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+nci_cidc_schemas-0.27.27.dist-info/entry_points.txt,sha256=kSyTzXeJQrJp_2ZX0GS_NnbJR8ceQKLBSgER46PM0hs,55
+nci_cidc_schemas-0.27.27.dist-info/top_level.txt,sha256=Wwb5Cu7QrnbmSJxI2d00e3-Mir36t0jTRnSulmfhi30,13
+nci_cidc_schemas-0.27.27.dist-info/RECORD,,