From 4e8f3e3ef781a7a514da56b4b176a502bd0e6b4d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:43:19 +0000 Subject: [PATCH 1/4] [pre-commit.ci] pre-commit autoupdate (#75) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b46ece6..e6bd45f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-case-conflict - id: trailing-whitespace From 4a8b151c7bb6ff4dbdb77708c828b3fbaa0f0a46 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 28 Jan 2025 12:36:41 +0000 Subject: [PATCH 2/4] Fix build issues (#77) * Update .readthedocs.yaml * Update tox.ini * Update tests.yml --- .github/workflows/tests.yml | 4 ++-- .readthedocs.yaml | 7 +++++-- tox.ini | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b706242..b2efc55 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 with: envs: | - - macos: py310-test - - linux: py311-test + - macos: py311-test - linux: py312-test + - linux: py313-test - linux: build_docs diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 0af9847..b679dad 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,9 +1,12 @@ version: 2 build: - os: ubuntu-22.04 + os: ubuntu-lts-latest tools: - python: mambaforge-4.10 + python: mambaforge-latest conda: environment: docs/rtd_environment.yaml + +sphinx: + configuration: docs/conf.py diff --git a/tox.ini b/tox.ini index 17b9b0c..5323ab1 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ deps = cookiecutter pytest-cookies pytest-venv - tox[testing] + tox[test] commands = pytest tests/ {posargs} From 3d3b97fdd6e94ba84abdf7af55b638e56f606130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Tue, 28 Jan 2025 15:01:03 +0100 Subject: [PATCH 3/4] MNT: update setuptools-scm section in pyproject.toml (write_to option is deprecated) (#76) --- {{ cookiecutter.package_name }}/pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{ cookiecutter.package_name }}/pyproject.toml b/{{ cookiecutter.package_name }}/pyproject.toml index 4b56cf5..714b1d4 100644 --- a/{{ cookiecutter.package_name }}/pyproject.toml +++ b/{{ cookiecutter.package_name }}/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools>=62.1", - "setuptools_scm[toml]>=6.2", + "setuptools_scm[toml]>=8.0.0", "wheel", {%- if cookiecutter.use_compiled_extensions == 'y' %} "extension-helpers", @@ -59,9 +59,9 @@ exclude = ["{{ cookiecutter.module_name }}._dev*"] [tool.setuptools_scm] {% if cookiecutter.enable_dynamic_dev_versions == 'y' -%} -write_to = "{{ cookiecutter.module_name }}/_version.py" +version_file = "{{ cookiecutter.module_name }}/_version.py" {%- else -%} -write_to = "{{ cookiecutter.module_name }}/version.py" +version_file = "{{ cookiecutter.module_name }}/version.py" {%- endif %} [tool.pytest.ini_options] From 2d7ac7076b824ffa82908d0b3599639523be0638 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 29 Jan 2025 09:09:01 +0000 Subject: [PATCH 4/4] Whoops --- .readthedocs.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ce597dc..b679dad 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,8 +1,5 @@ version: 2 -sphinx: - configuration: docs/conf.py - build: os: ubuntu-lts-latest tools: