From e372c63366049a6ef1629fc3194dd02f2e87605f Mon Sep 17 00:00:00 2001
From: alasdairwilson <60351846+alasdairwilson@users.noreply.github.com>
Date: Mon, 3 Mar 2025 07:20:54 +0000
Subject: [PATCH] Automatic package template update

---
 .cruft.json        |  5 +++--
 pyproject.toml.rej | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pyproject.toml.rej

diff --git a/.cruft.json b/.cruft.json
index b6429dc..40691bb 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/OpenAstronomy/packaging-guide",
-  "commit": "6fe7011594f8472635c689c9a60a359cbbfbcf17",
+  "commit": "cb394c68be7c573ddcfaeeea54757c72555eedd0",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -24,7 +24,8 @@
         "docs/_static",
         ".github/workflows/sub_package_update.yml"
       ],
-      "_template": "https://github.com/OpenAstronomy/packaging-guide"
+      "_template": "https://github.com/OpenAstronomy/packaging-guide",
+      "_commit": "cb394c68be7c573ddcfaeeea54757c72555eedd0"
     }
   },
   "directory": null
diff --git a/pyproject.toml.rej b/pyproject.toml.rej
new file mode 100644
index 0000000..aaf6eb1
--- /dev/null
+++ b/pyproject.toml.rej
@@ -0,0 +1,32 @@
+diff a/pyproject.toml b/pyproject.toml	(rejected hunks)
+@@ -1,7 +1,7 @@
+ [build-system]
+ requires = [
+   "setuptools>=62.1",
+-  "setuptools_scm[toml]>=6.2",
++  "setuptools_scm[toml]>=8.0.0",
+   "wheel",]
+ build-backend = "setuptools.build_meta"
+ 
+@@ -10,7 +10,7 @@ name = "ripplemapper"
+ description = "Tools for analysing the water air interface to detect waves"
+ requires-python = ">=3.9"
+ readme = { file = "README.rst", content-type = "text/x-rst" }
+-license = { file = "licenses/LICENSE.rst", content-type = "text/plain" }
++license = { file = "licenses/LICENSE.rst" }
+ authors = [
+   { name = "Alasdair Wilson", email = "alasdair.wlsn@googlemail.com" },
+ ]
+@@ -36,10 +36,10 @@ zip-safe = false
+ include-package-data = true
+ 
+ [tool.setuptools.packages.find]
+-
++include = ["ripplemapper*"]
+ 
+ [tool.setuptools_scm]
+-write_to = "ripplemapper/version.py"
++version_file = "ripplemapper/version.py"
+ 
+ [tool.pytest.ini_options]
+ testpaths = [