From f8c53720d24713dec6143aca302d19e26d88ab89 Mon Sep 17 00:00:00 2001
From: Cadair <1391051+Cadair@users.noreply.github.com>
Date: Mon, 29 Jul 2024 07:03:10 +0000
Subject: [PATCH 1/2] Automatic package template update

---
 .cruft.json             | 2 +-
 .pre-commit-config.yaml | 2 +-
 pyproject.toml          | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index 6b88a60..cc5469f 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "112d7d4adf0fa168bbb9ddb1886ad4f1e595b8be",
+  "commit": "2fbaccff08fdfbb1bc1eec2bc7b980fe44a718e6",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 360ff7e..81b88e5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: ".*(.csv|.fits|.fts|.fit|.header|.txt|tca.*|.json|.asdf)$|^CITATION.rst
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.2"
+    rev: "v0.5.4"
     hooks:
       - id: ruff
         args: ["--fix"]
diff --git a/pyproject.toml b/pyproject.toml
index 41f1f1a..c97e7dd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,11 @@ name = "mpl_animators"
 description = "An interactive animation framework for matplotlib."
 requires-python = ">=3.10"
 readme = { file = "README.rst", content-type = "text/x-rst" }
+<<<<<<<
 license = { file = "licenses/LICENSE.rst"}
+=======
+license = { file = "licenses/LICENSE.rst" }
+>>>>>>>
 authors = [
   { name = "The SunPy Developers", email = "sunpy@googlegroups.com" },
 ]

From 7ec75e3b08b6bcb325d3fbdc920ba324a4e782dd Mon Sep 17 00:00:00 2001
From: Nabil Freij <nabil.freij@gmail.com>
Date: Mon, 29 Jul 2024 08:40:19 -0700
Subject: [PATCH 2/2] Update pyproject.toml

---
 pyproject.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c97e7dd..24cb993 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,11 +11,7 @@ name = "mpl_animators"
 description = "An interactive animation framework for matplotlib."
 requires-python = ">=3.10"
 readme = { file = "README.rst", content-type = "text/x-rst" }
-<<<<<<<
-license = { file = "licenses/LICENSE.rst"}
-=======
 license = { file = "licenses/LICENSE.rst" }
->>>>>>>
 authors = [
   { name = "The SunPy Developers", email = "sunpy@googlegroups.com" },
 ]