Merge branch 'main' into refactor/switch-to-cocogitto-and-git-cliff

lwjohnst86 · web-flow · commit a733b1d8e306 · 2026-06-01T15:37:55.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -24,11 +24,11 @@ repos:
   # sub-packages, which confuses pre-commit when it tries to find the latest
   # version
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.46.2
+    rev: v1.46.3
     hooks:
       - id: typos
 
   - repo: https://github.com/rvben/rumdl-pre-commit
-    rev: v0.1.96
+    rev: v0.2.0
     hooks:
       - id: rumdl-fmt # Auto-format
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,15 @@ within each release.
 Commits from bots, like `dependabot` or `pre-commit-ci`, are not
 included in the changelog.
 
+## [0.23.2](https://github.com/seedcase-project/template-python-package/compare/0.23.1..0.23.2) - 2026-05-22
+
+### ♻️ Refactor
+
+- Match changes from t-squared and from root folder
+  [#287](https://github.com/seedcase-project/template-python-package/pull/287)
+  by [`@lwjohnst86`](https://github.com/lwjohnst86)
+  ([317884a](https://github.com/seedcase-project/template-python-package/commit/317884a3486afc9d8aa7524039d3c1014babb9df))
+
 ## [0.23.1](https://github.com/seedcase-project/template-python-package/compare/0.23.0..0.23.1) - 2026-05-22
 
 ### ♻️ Refactor
diff --git a/template/.editorconfig b/template/.editorconfig
@@ -15,7 +15,6 @@ max_line_length = 88
 # Have a bit shorter line length for text docs
 [*.{txt,md,qmd}]
 max_line_length = 72
-indent_size = 4
 
 # Python always uses 4 spaces for tabs
 [*.py]
diff --git a/template/.github/CODEOWNERS.jinja b/template/.github/CODEOWNERS.jinja
@@ -1,2 +1,4 @@
-# All members on Developers team get added to review PRs
-* {{ review_team }}
+# Which team or person to inform for PRs that modify these files.
+# `*` means all files in the repository.
+# TODO: Add code owners.
+*
diff --git a/template/.github/workflows/add-to-project.yml.jinja b/template/.github/workflows/add-to-project.yml.jinja
@@ -20,7 +20,7 @@ jobs:
     permissions:
       pull-requests: write
     with:
-      # TODO: Fill in the board number.
+      # TODO: Add the board number.
       board-number: ""
       app-id: {{ '${{ vars.ADD_TO_BOARD_APP_ID }}' }}
     secrets:
diff --git a/template/.pre-commit-config.yaml b/template/.pre-commit-config.yaml
@@ -15,18 +15,20 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: [--fix=lf]
       - id: check-merge-conflict
         args: [--assume-in-merge]
 
   # Use the mirror since the main `typos` repo has tags for different
   # sub-packages, which confuses pre-commit when it tries to find the latest
   # version
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.43.4
+    rev: v1.46.2
     hooks:
       - id: typos
 
   - repo: https://github.com/rvben/rumdl-pre-commit
-    rev: v0.1.18
+    rev: v0.1.94
     hooks:
       - id: rumdl-fmt # Auto-format
diff --git a/template/LICENSE.md.jinja b/template/LICENSE.md.jinja
@@ -2,20 +2,21 @@
 
 Copyright (c) {{ copyright_year }} {{ github_repo }} authors
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/template/README.md b/template/README.md
@@ -1 +1 @@
-NOTE: Will be overwritten after running `just build-readme`.
+<!-- Will be generated from README.qmd -->
diff --git a/template/TODO.md b/template/TODO.md
@@ -27,20 +27,16 @@
     repository.
   - Create an `UPDATE_VERSION_APP_ID` and `ADD_TO_BOARD_APP_ID` variable
     of the GitHub Apps' IDs if you haven't already and connect them to
-    the repository.
-    {%- else -%}
+    the repository. {%- else -%}
 - Install the [gh CLI](https://cli.github.com/) to create the GitHub
   repository from the command line by using
-  `gh repo create {{ github_repo_spec }} --source=. --public`.
-  {%- endif %}
-  {% if hosting_provider == "netlify" %}
+  `gh repo create {{ github_repo_spec }} --source=. --public`. {%- endif
+  %} {% if hosting_provider == "netlify" %}
 - Connect the repository to Netlify and turn off the builds on Netlify,
   since you will be using GitHub Actions to build and deploy the
-  website.
-  {%- elif hosting_provider == "gh-pages" -%}
+  website. {%- elif hosting_provider == "gh-pages" -%}
 - Run `quarto publish gh-pages` to setup and start publishing the
-  website to GitHub Pages.
-  {%- endif %}
+  website to GitHub Pages. {%- endif %}
 - If relevant, connect [GoatCounter](https://www.goatcounter.com/).
 - If relevant, connect [pre-commit.ci](https://pre-commit.ci/) to the
   repository and enable the pre-commit hooks.
diff --git a/template/_metadata.yml.jinja b/template/_metadata.yml.jinja
@@ -1,8 +1,11 @@
 gh:
-  repo: {{ github_repo }}
-  org: {{ github_user }}
+  org: "{{ github_user }}"
+  repo: "{{ github_repo }}"
+
+# TODO: Add a short description of the package here, used in the README and landing page.
+tagline: ""
 
 links:
   github: "https://github.com/{{ github_user }}/{{ github_repo }}"
-  # TODO: Confirm this is the correct URL
-  site: "https://{{ github_repo }}.{{ github_user }}.org
+  # TODO: Add the correct URL
+  site: ""
diff --git a/template/_quarto.yml.jinja b/template/_quarto.yml.jinja
@@ -1,5 +1,5 @@
 project:
-  # TODO: change to extension name if using a custom extension
+  # TODO: Change to extension name if using a custom extension
   type: website
 
 website:
@@ -8,8 +8,8 @@ website:
   {% if hosting_provider == "gh-pages" -%}
   site-url: "https://{{ github_user }}.github.io/{{ github_repo }}/"
   {%- elif hosting_provider == "netlify" -%}
-  # TODO: Set the Netlify custom domain URL
-  site-url: "{{ homepage }}"
+  # TODO: Add the Netlify custom domain URL
+  site-url: ""
   {%- endif %}
   repo-url: "https://github.com/{{ github_repo_spec }}"
   page-navigation: true
@@ -20,7 +20,7 @@ website:
     logo: "_extensions/seedcase-project/seedcase-theme/logos/{{ github_repo }}/navbar.svg"
     logo-alt: "{{ github_repo }} logo: Main page"
     {%- else %}
-    # TODO: add logo
+    # TODO: Add logo if desired
     logo: ""
     logo-alt: "{{ github_repo }} logo: Main page"
     {%- endif %}
diff --git a/template/tools/get-contributors.sh b/template/tools/get-contributors.sh
@@ -11,10 +11,12 @@ contributors=$(gh api \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
   /repos/$repo_spec/contributors \
-  --template '{{range .}} [\@{{.login}}]({{.html_url}}){{"\n"}}{{end}}' | \
+  --template '{{range .}}[\@{{.login}}]({{.html_url}}){{"\n"}}{{end}}' | \
   grep -v "\[bot\]" | \
+  sort | \
   tr '\n' ', ' | \
-  sed -e 's/,$/\n/'
+  sed -e 's/,$/\n/' | \
+  sed -e 's/,/,\n/g'
 )
 
-echo "The following people have contributed to this project by submitting pull requests :tada:\n\n${contributors}"
+echo "The following people have contributed to this project by submitting pull\nrequests :tada:\n\n${contributors}"
diff --git a/template/{% if hosting_provider == "netlify" %}_publish.yml{% endif %}.jinja b/template/{% if hosting_provider == "netlify" %}_publish.yml{% endif %}.jinja
@@ -1,5 +1,5 @@
 - source: project
   netlify:
-    # TODO: Include correct ID and URL
+    # TODO: Add correct ID and URL
     - id: ""
       url: "https://{{ github_user }}-{{ github_repo }}.netlify.app"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-NOTE: Will be overwritten after running `just build-readme`.
	`1`	`+<!-- Will be generated from README.qmd -->`