From 42d89c6a8264db7ba9230a1ebe6eb2fc8e155346 Mon Sep 17 00:00:00 2001 From: SolarDrew <1914702+SolarDrew@users.noreply.github.com> Date: Mon, 2 Sep 2024 07:13:20 +0000 Subject: [PATCH] Automatic package template update --- .cruft.json | 2 +- .pre-commit-config.yaml | 2 +- .readthedocs.yaml | 2 +- .rtd-environment.yml | 2 +- pyproject.toml | 6 ++++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cruft.json b/.cruft.json index 72ad7fdd..6c367020 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "112d7d4adf0fa168bbb9ddb1886ad4f1e595b8be", + "commit": "f7458b35be5824d419efd6ce8c135ff67a00d1d5", "checkout": null, "context": { "cookiecutter": { diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4b9954cf..563b1dba 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.5.2" + rev: "v0.6.2" hooks: - id: ruff args: ["--fix"] diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 419484ec..29475caa 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,7 +1,7 @@ version: 2 build: - os: ubuntu-22.04 + os: ubuntu-lts-latest tools: python: "mambaforge-latest" jobs: diff --git a/.rtd-environment.yml b/.rtd-environment.yml index f3d2fdbe..2dc187de 100644 --- a/.rtd-environment.yml +++ b/.rtd-environment.yml @@ -2,6 +2,6 @@ name: dkist channels: - conda-forge dependencies: - - python=3.10 + - python=3.12 - pip - graphviz!=2.42.*,!=2.43.* diff --git a/pyproject.toml b/pyproject.toml index d8130fb8..9b184cd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,8 @@ requires = [ "setuptools>=62.1", "setuptools_scm[toml]>=6.2", - "wheel",] + "wheel", +] build-backend = "setuptools.build_meta" [project] @@ -10,7 +11,7 @@ name = "dkist" description = "DKIST User Tools" requires-python = ">=3.10" 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 = "NSO / AURA", email = "stuart@cadair.com" }, ] @@ -85,6 +86,7 @@ zip-safe = false include-package-data = true [tool.setuptools.packages.find] +include = ["dkist*"] exclude = ["dkist._dev*"] [tool.setuptools_scm]