nci-cidc-schemas 0.27.28__py2.py3-none-any.whl → 0.28.1__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.28"
+__version__ = "0.28.1"

cidc_schemas/json_validation.py

@@ -273,8 +273,7 @@ def _map_refs(node: dict, on_refs: Callable[[str], dict]) -> dict:
                     # So we raise on that, to notify schema creator that s/he should not
                     # expect those additional keys to be verified by schema validator.
                     raise Exception(
-                        f"Schema node with '$ref' should not contain anything else besides 'description' for public docs (or '$comment' for dev docs). \
-                        \nOn: {node} \nOffending keys {extra_keys}"
+                        f"Schema node with '$ref' should not contain anything else besides 'description' for public docs (or '$comment' for dev docs). \nOn: {node} \nOffending keys {extra_keys}"
                     )
 
             # We found a ref, so return it mapped through `on_refs`

cidc_schemas/template.py

@@ -25,7 +25,7 @@ from .constants import ANALYSIS_TEMPLATE_DIR, SCHEMA_DIR, TEMPLATE_DIR
 from .json_validation import _load_dont_validate_schema
 from .util import get_file_ext, get_logger
 
-from cidc_ngs_pipeline_api import OUTPUT_APIS
+from .ngs_pipeline_api import OUTPUT_APIS
 
 logger = get_logger("cidc_schemas.template")
 

{nci_cidc_schemas-0.27.28.dist-info → nci_cidc_schemas-0.28.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_schemas
-Version: 0.27.28
+Version: 0.28.1
 Summary: The CIDC data model and tools for working with it.
 Home-page: https://github.com/NCI-CIDC/cidc-schemas
 Author: NCI
@@ -11,24 +11,21 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.9,<3.11
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.13,<3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dateparser==1.1.4
-Requires-Dist: xlsxwriter==1.1.6
-Requires-Dist: argparse==1.1
-Requires-Dist: pyyaml==6.0.1
-Requires-Dist: jsonschema==3.0.1
-Requires-Dist: openpyxl==3.0.7
+Requires-Dist: argparse==1.4.0
+Requires-Dist: dateparser==1.2.2
+Requires-Dist: deepdiff==4.3.0
+Requires-Dist: jinja2==3.1.6
 Requires-Dist: jsonmerge==1.6.1
-Requires-Dist: deepdiff~=4.3.0
-Requires-Dist: jsonpointer==2.0
-Requires-Dist: pandas==1.5.3
-Requires-Dist: jinja2~=3.1.3
-Requires-Dist: nci-cidc-ngs-pipeline-api==0.1.25
-Requires-Dist: markupsafe==2.1.5
-Requires-Dist: regex==2022.3.2
+Requires-Dist: jsonpointer==3.0.0
+Requires-Dist: jsonschema==3.2.0
+Requires-Dist: openpyxl==3.1.5
+Requires-Dist: pandas==2.3.1
+Requires-Dist: pyyaml==6.0.2
+Requires-Dist: xlsxwriter==3.2.5
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{nci_cidc_schemas-0.27.28.dist-info → nci_cidc_schemas-0.28.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-cidc_schemas/__init__.py,sha256=6omZ_AmjReFyYGR3ZLS8zV6hvtmrnyhlW9y94oYbgHs,136
+cidc_schemas/__init__.py,sha256=4lhMRxh2IN3Z7QsxgbJxJiGSha0cwykVNIFIpM6JMCI,135
 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
+cidc_schemas/json_validation.py,sha256=4UxcYrofXlDT-Lz6uiQGO1Jwz5bRs0mN_UH4p_A84ks,23262
 cidc_schemas/migrations.py,sha256=Amg_T4cFgMzySD7yNnT_PWpqP7hwlTWGeHlI_RSXuRI,14766
-cidc_schemas/template.py,sha256=NWWAvH5r9VXJN9DZgJZ-z5UkLTNFYm9yrHYB2vbHx-o,51418
+cidc_schemas/template.py,sha256=BIGguKwCtyi8wwi0xpfJ6Mj4gf--1cCVybsPxpNObfs,51414
 cidc_schemas/template_reader.py,sha256=3E9acCr_3TP-PP2qXNyxAnIg1m4TJ6v8VVPogUKW5qA,13126
 cidc_schemas/template_writer.py,sha256=Lk5hw05owoLLsGXimd2H8FSyqBZ2_HpC5wCWw-Xxm5w,18243
 cidc_schemas/unprism.py,sha256=TOD3CSGkgNnTtT-OeCCE3Ihlam84lr8XGOmtdSy2lL8,13545
@@ -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.28.dist-info/licenses/LICENSE,sha256=zK77-w4rYCZBHAYJEGkcFuPXwKIsP7jMPZ2iQOXjzko,1072
-nci_cidc_schemas-0.27.28.dist-info/METADATA,sha256=TigK-2nNG0G6iJ2DJf1BJgmjqHH32gQymfeXPxmrYOk,5116
-nci_cidc_schemas-0.27.28.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-nci_cidc_schemas-0.27.28.dist-info/entry_points.txt,sha256=kSyTzXeJQrJp_2ZX0GS_NnbJR8ceQKLBSgER46PM0hs,55
-nci_cidc_schemas-0.27.28.dist-info/top_level.txt,sha256=Wwb5Cu7QrnbmSJxI2d00e3-Mir36t0jTRnSulmfhi30,13
-nci_cidc_schemas-0.27.28.dist-info/RECORD,,
+nci_cidc_schemas-0.28.1.dist-info/licenses/LICENSE,sha256=zK77-w4rYCZBHAYJEGkcFuPXwKIsP7jMPZ2iQOXjzko,1072
+nci_cidc_schemas-0.28.1.dist-info/METADATA,sha256=IGxjB0w5Wqghr6x3I8yysZ50C6rtLwebgMnFSHjCt80,5008
+nci_cidc_schemas-0.28.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+nci_cidc_schemas-0.28.1.dist-info/entry_points.txt,sha256=kSyTzXeJQrJp_2ZX0GS_NnbJR8ceQKLBSgER46PM0hs,55
+nci_cidc_schemas-0.28.1.dist-info/top_level.txt,sha256=Wwb5Cu7QrnbmSJxI2d00e3-Mir36t0jTRnSulmfhi30,13
+nci_cidc_schemas-0.28.1.dist-info/RECORD,,