dcicutils 8.18.0__tar.gz → 8.18.1.1b1__tar.gz

{dcicutils-8.18.0 → dcicutils-8.18.1.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.18.0
+Version: 8.18.1.1b1
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.18.0 → dcicutils-8.18.1.1b1}/dcicutils/portal_utils.py

@@ -471,6 +471,19 @@ class Portal:
             super_type_map_flattened[super_type_name] = list_breadth_first(super_type_map, super_type_name)
         return super_type_map_flattened
 
+    @lru_cache(maxsize=100)
+    def get_schema_super_type_names(self, schema_name: str, include_schema_name: bool = False) -> List[str]:
+        if isinstance(schema_name, str) and (schema_name := self.schema_name(schema_name)):
+            if isinstance(super_type_map := self.get_schemas_super_type_map(), dict):
+                super_types = set()
+                for super_type_name in super_type_map:
+                    if schema_name in super_type_map[super_type_name]:
+                        super_types.add(super_type_name)
+                if (include_schema_name is True) and super_types and self.get_schema(schema_name):
+                    super_types.add(schema_name)
+                return list(super_types)
+        return []
+
     @lru_cache(maxsize=100)
     def get_schema_subtype_names(self, type_name: str) -> List[str]:
         if not (schemas_super_type_map := self.get_schemas_super_type_map()):

{dcicutils-8.18.0 → dcicutils-8.18.1.1b1}/dcicutils/submitr/custom_excel.py

@@ -76,7 +76,7 @@ from dcicutils.misc_utils import to_boolean, to_float, to_integer
 # the same (portal) type; see comments below near the ExcelSheetName class definition.
 
 CUSTOM_COLUMN_MAPPINGS_BASE_URL = "https://raw.githubusercontent.com/smaht-dac/submitr/refs/heads"
-CUSTOM_COLUMN_MAPPINGS_BRANCH = "dmichaels-custom-column-mappings-20250115"
+CUSTOM_COLUMN_MAPPINGS_BRANCH = "master"
 CUSTOM_COLUMN_MAPPINGS_PATH = "submitr/config/custom_column_mappings.json"
 CUSTOM_COLUMN_MAPPINGS_URL = f"{CUSTOM_COLUMN_MAPPINGS_BASE_URL}/{CUSTOM_COLUMN_MAPPINGS_BRANCH}/{CUSTOM_COLUMN_MAPPINGS_PATH}"  # noqa
 CUSTOM_COLUMN_MAPPINGS_LOCAL = False

{dcicutils-8.18.0 → dcicutils-8.18.1.1b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.18.0"
+version = "8.18.1.1b1"  # TODO: 8.18.2
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"