From 608f4b66436e32856d4df0cdc7a0d6d21f033d8b Mon Sep 17 00:00:00 2001
From: David Michaels <david_michaels@hms.harvard.edu>
Date: Fri, 28 Feb 2025 11:38:43 -0500
Subject: [PATCH] corrected url path to custom_column_mappings.json in
 submitr/custom_excel.py

---
 CHANGELOG.rst                     | 7 +++++++
 dcicutils/submitr/custom_excel.py | 2 +-
 pyproject.toml                    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8b21a228a..b4a3d6c06 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,13 @@ dcicutils
 Change Log
 ----------
 
+8.18.1
+======
+* dmichaels / 2025-02-28 / branch: dmichaels-20250228-correct-submitr-config-path / PR-327
+  - Corrected branch to smaht-submitr config dcicutils/submitr/custom_excel.py to master branch; i.e.:
+    https://raw.githubusercontent.com/smaht-dac/submitr/refs/heads/master/submitr/config/custom_column_mappings.json
+
+
 8.18.0
 ======
 * dmichaels / 2025-02-11 / branch: dmichaels-20250211-submitr-custom-excel / PR-326
diff --git a/dcicutils/submitr/custom_excel.py b/dcicutils/submitr/custom_excel.py
index 2b5e6f019..fdf8b5cbb 100644
--- a/dcicutils/submitr/custom_excel.py
+++ b/dcicutils/submitr/custom_excel.py
@@ -76,7 +76,7 @@
 # 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
diff --git a/pyproject.toml b/pyproject.toml
index 619626836..6ebeb31cb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.18.0"
+version = "8.18.1"
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"