From 2975025c4188ba7d4b2f813a53efafe690047289 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 11 Sep 2024 10:51:02 +0100 Subject: [PATCH] Update cruft with batchpr --- .cruft.json | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/sub_package_update.yml | 2 +- .pre-commit-config.yaml | 2 +- sunkit_magex/pfss/tests/test_map.py | 12 ------------ sunkit_magex/pfss/utils.py | 2 +- 6 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 sunkit_magex/pfss/tests/test_map.py diff --git a/.cruft.json b/.cruft.json index c2ffd5c..5a0e612 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "67ea3b3815de57668e92dbe1fa2c3d033758d8f0", + "commit": "c0e51ac3283d88346534da0aac441f37f624b283", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 334e2d9..089d5de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,6 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} publish: - needs: [test, docs] # Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.* # see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi if: | @@ -101,6 +100,7 @@ jobs: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Run publish') ) + needs: [test, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main with: python-version: '3.12' diff --git a/.github/workflows/sub_package_update.yml b/.github/workflows/sub_package_update.yml index 0677948..7455847 100644 --- a/.github/workflows/sub_package_update.yml +++ b/.github/workflows/sub_package_update.yml @@ -65,7 +65,7 @@ jobs: - name: Create pull request if: steps.check.outputs.has_changes == '1' - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GITHUB_TOKEN }} add-paths: ${{ matrix.add-paths }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fe741fd..ccc081c 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.6.3" + rev: "v0.6.4" hooks: - id: ruff args: ["--fix"] diff --git a/sunkit_magex/pfss/tests/test_map.py b/sunkit_magex/pfss/tests/test_map.py deleted file mode 100644 index 0b994d4..0000000 --- a/sunkit_magex/pfss/tests/test_map.py +++ /dev/null @@ -1,12 +0,0 @@ -import astropy.io - -import sunpy.map - -import sunkit_magex.pfss.map - - -def test_adapt_map(adapt_test_file): - with astropy.io.fits.open(adapt_test_file) as adapt_fits: - for map_slice in adapt_fits[0].data: - m = sunpy.map.Map((map_slice, adapt_fits[0].header)) - assert isinstance(m, sunkit_magex.pfss.map.ADAPTMap) diff --git a/sunkit_magex/pfss/utils.py b/sunkit_magex/pfss/utils.py index 2e850f2..ec9cf4b 100644 --- a/sunkit_magex/pfss/utils.py +++ b/sunkit_magex/pfss/utils.py @@ -150,7 +150,7 @@ def carr_cea_wcs_header(dtime, shape, *, map_center_longitude=0*u.deg): def _get_projection(m, i): - return m.meta[f'ctype{i}'][5:8] + return m.coordinate_system.axis1.split("-")[-1] def _check_projection(m, proj_code, error=False):