From 5fa313eff2030a31ec431d6b4651f07ec5d4a1db Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 11 Jun 2025 18:01:27 +0100 Subject: [PATCH 1/6] Update cruft with batchpr --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.cruft.json b/.cruft.json index 09e1da2..70963f8 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "1bdd28c1e2d725d9ae9d9c0b6ad682d75687f45d", + "commit": "15fdf534198e4f67f0a667af7d2367e93de181c5", "checkout": null, "context": { "cookiecutter": { @@ -32,7 +32,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "1bdd28c1e2d725d9ae9d9c0b6ad682d75687f45d" + "_commit": "15fdf534198e4f67f0a667af7d2367e93de181c5" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 710190d..13561a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,14 +29,14 @@ concurrency: jobs: core: - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2 with: submodules: false coverage: codecov toxdeps: "tox-pypi-filter" posargs: -n auto envs: | - - linux: py312 + - linux: py313 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -54,23 +54,28 @@ jobs: test: needs: [core, sdist_verify] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2 with: submodules: false coverage: codecov toxdeps: "tox-pypi-filter" posargs: -n auto envs: | +<<<<<<< - windows: py10 - macos: py311 +======= + - windows: py311 + - macos: py312 +>>>>>>> - linux: py310-oldestdeps - - linux: py311-devdeps + - linux: py313-devdeps secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} docs: needs: [core] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2 with: default_python: '3.12' submodules: false @@ -106,7 +111,7 @@ jobs: contains(github.event.pull_request.labels.*.name, 'Run publish') ) needs: [test, docs] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v2 with: python-version: '3.12' test_extras: 'tests' From fcc1e994ab1ac322d2464c4863af50ede80c5ce8 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 11 Jun 2025 21:06:31 +0100 Subject: [PATCH 2/6] Update ci.yml --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13561a0..c7f6795 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,13 +61,8 @@ jobs: toxdeps: "tox-pypi-filter" posargs: -n auto envs: | -<<<<<<< - - windows: py10 - - macos: py311 -======= - windows: py311 - macos: py312 ->>>>>>> - linux: py310-oldestdeps - linux: py313-devdeps secrets: From a4be8936bac380fcfcaedc5600500c4e0c5f6f04 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 11 Jun 2025 21:08:02 +0100 Subject: [PATCH 3/6] Update tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f08d4b0..b48a8dd 100644 --- a/tox.ini +++ b/tox.ini @@ -41,7 +41,7 @@ setenv = JSOC_EMAIL = jsoc@sunpy.org deps = # For packages which publish nightly wheels this will pull the latest nightly - devdeps: numpy>=0.0.dev0 + devdeps: astropy>=0.0.dev0 # Packages without nightly wheels will be built from source like this # devdeps: git+https://github.com/ndcube/ndcube oldestdeps: minimum_dependencies @@ -49,7 +49,7 @@ deps = pytest-xdist pytest-timeout # These are specific extras we use to run the sunpy tests. - sunpy: git+https://github.com/sunpy/sunpy + sunpy: sunpy>=0.0.dev0 sunpy: beautifulsoup4 sunpy: mpl-animators sunpy: reproject From 0d02b5fd2fa2f84552ce616a83afb9a47b695256 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 11 Jun 2025 21:09:52 +0100 Subject: [PATCH 4/6] Update pyproject.toml --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1a1f82c..5ee9cdb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ tests = [ "pytest-doctestplus", "pytest-cov", "pytest-xdist", - "astropy", ] docs = [ "sphinx", From 237b4176bdf82e43f80b1ca702a0b50186202c78 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 11 Jun 2025 21:10:27 +0100 Subject: [PATCH 5/6] Update tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index b48a8dd..2eba8dd 100644 --- a/tox.ini +++ b/tox.ini @@ -41,11 +41,11 @@ setenv = JSOC_EMAIL = jsoc@sunpy.org deps = # For packages which publish nightly wheels this will pull the latest nightly - devdeps: astropy>=0.0.dev0 + # devdeps: astropy>=0.0.dev0 # Packages without nightly wheels will be built from source like this # devdeps: git+https://github.com/ndcube/ndcube oldestdeps: minimum_dependencies - # The following indicates which extras_require will be installed + # Extra pluings for the CI pytest-xdist pytest-timeout # These are specific extras we use to run the sunpy tests. From a0de8bb043af55a3b73de32a975152ff45b4a0e8 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 11 Jun 2025 21:12:26 +0100 Subject: [PATCH 6/6] Update pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 5ee9cdb..e888602 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ dynamic = [ "version" ] [project.optional-dependencies] tests = [ + "astropy", # Doctests "pytest", "pytest-astropy", "pytest-doctestplus",