From c45aef832208f3c79ebe89253692ed316df4aef3 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Mon, 10 Nov 2025 07:04:46 +0000 Subject: [PATCH 1/2] Automatic package template update --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 4 ++-- pyproject.toml | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cruft.json b/.cruft.json index 82c636c..8fecb19 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "bea8060eef60df35f7df61d9db1d56b838bda01a", + "commit": "c359c134fbf9e3f11302c2019fb58ac11cf14cdf", "checkout": null, "context": { "cookiecutter": { @@ -32,7 +32,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "bea8060eef60df35f7df61d9db1d56b838bda01a" + "_commit": "c359c134fbf9e3f11302c2019fb58ac11cf14cdf" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8f05191..e44ffd1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,12 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.13.2" + rev: "v0.14.3" hooks: - id: ruff args: ["--fix"] - repo: https://github.com/PyCQA/isort - rev: 6.0.1 + rev: 7.0.0 hooks: - id: isort exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*|streamtracer/extern)$" diff --git a/pyproject.toml b/pyproject.toml index 8876800..f361675 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,11 @@ name = "streamtracer" description = "Python library to calculate streamlines" requires-python = ">=3.12" readme = { file = "README.rst", content-type = "text/x-rst" } +<<<<<<< license = { file = "LICENSE" } +======= +license-files = ["licenses/LICENSE.rst"] +>>>>>>> authors = [ {name = "The SunPy Developers", email="sunpy@googlegroups.com"}, {name = "David Stansby"}, From 9326b832a0b2971df0a9c75e963897f8fb37b984 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Fri, 14 Nov 2025 11:22:14 -0800 Subject: [PATCH 2/2] Update pyproject.toml --- pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f361675..b1cba6f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,11 +9,7 @@ name = "streamtracer" description = "Python library to calculate streamlines" requires-python = ">=3.12" readme = { file = "README.rst", content-type = "text/x-rst" } -<<<<<<< -license = { file = "LICENSE" } -======= license-files = ["licenses/LICENSE.rst"] ->>>>>>> authors = [ {name = "The SunPy Developers", email="sunpy@googlegroups.com"}, {name = "David Stansby"},