From d3ffe2d9b69de6a40f3670cd9707262289028919 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Mon, 17 Feb 2025 07:03:46 +0000 Subject: [PATCH 1/3] Automatic package template update --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 2 +- README.rst | 5 +++++ docs/conf.py | 9 +++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index cf3a5952..c01be26b 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "4f11e366c6efc9dcb5658ca952ec4196e201212b", + "commit": "09c4b023b973d0bbc5704326720f21d3a766bb11", "checkout": null, "context": { "cookiecutter": { @@ -32,7 +32,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "4f11e366c6efc9dcb5658ca952ec4196e201212b" + "_commit": "09c4b023b973d0bbc5704326720f21d3a766bb11" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4a8d8a92..8d2b48d9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.9.4" + rev: "v0.9.6" hooks: - id: ruff args: ["--fix"] diff --git a/README.rst b/README.rst index cf2c718d..0dd713dd 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,12 @@ data. Documentation ------------- +<<<<<<< See the documentation at `https://docs.dkist.nso.edu/projects/python-tools `__. +======= +Usage of Generative AI +---------------------- +>>>>>>> Installation ------------ diff --git a/docs/conf.py b/docs/conf.py index f44973df..a5c5db99 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -62,6 +62,15 @@ # -- General configuration --------------------------------------------------- +<<<<<<< +======= +# Wrap large function/method signatures +maximum_signature_line_length = 80 + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named "sphinx.ext.*") or your custom +# ones. +>>>>>>> # Suppress warnings about overriding directives as we overload some of the # doctest extensions. suppress_warnings = ["app.add_directive", ] From de13b88d42513816efa4b6e479027040a8f82538 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 17 Feb 2025 08:49:32 +0000 Subject: [PATCH 2/3] Update README.rst --- README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.rst b/README.rst index 0dd713dd..cf2c718d 100644 --- a/README.rst +++ b/README.rst @@ -28,12 +28,7 @@ data. Documentation ------------- -<<<<<<< See the documentation at `https://docs.dkist.nso.edu/projects/python-tools `__. -======= -Usage of Generative AI ----------------------- ->>>>>>> Installation ------------ From da6427c1481d63699a518bce830fa870d28d93ce Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 17 Feb 2025 08:50:01 +0000 Subject: [PATCH 3/3] Update conf.py --- docs/conf.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index a5c5db99..0a96bb3a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -62,15 +62,9 @@ # -- General configuration --------------------------------------------------- -<<<<<<< -======= # Wrap large function/method signatures maximum_signature_line_length = 80 -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named "sphinx.ext.*") or your custom -# ones. ->>>>>>> # Suppress warnings about overriding directives as we overload some of the # doctest extensions. suppress_warnings = ["app.add_directive", ]