diff --git a/.circleci/config.yml b/.circleci/config.yml index b1f5766e5..28c860eef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: jobname: type: string docker: - - image: cimg/python:3.10 + - image: cimg/python:3.12 environment: TOXENV=<< parameters.jobname >> steps: @@ -57,7 +57,7 @@ jobs: jobname: type: string docker: - - image: cimg/python:3.10 + - image: cimg/python:3.12 environment: TOXENV: << parameters.jobname >> GIT_SSH_COMMAND: ssh -i ~/.ssh/id_rsa_b1c8b094a8ec67162b0f18a949a6b1db @@ -99,16 +99,16 @@ workflows: matrix: parameters: jobname: - - "py310-figure" - - "py310-figure-devdeps" + - "py312-figure" + - "py312-figure-devdeps" - deploy-reference-images: name: baseline-<< matrix.jobname >> matrix: parameters: jobname: - - "py310-figure" - - "py310-figure-devdeps" + - "py312-figure" + - "py312-figure-devdeps" requires: - << matrix.jobname >> filters: diff --git a/.cruft.json b/.cruft.json index 74de9bac0..3c67ff1e4 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 8b15d8282..49aa6d5b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,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: | @@ -105,6 +104,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 067794816..74558476a 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 d2a3cd17d..66793b2c8 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/ndcube/visualization/tests/figure_hashes_mpl_372_ft_261_astropy_533_animators_100.json b/ndcube/visualization/tests/figure_hashes_mpl_382_ft_261_astropy_600_animators_111.json similarity index 100% rename from ndcube/visualization/tests/figure_hashes_mpl_372_ft_261_astropy_533_animators_100.json rename to ndcube/visualization/tests/figure_hashes_mpl_382_ft_261_astropy_600_animators_111.json diff --git a/ndcube/wcs/wrappers/tests/test_resampled_wcs.py b/ndcube/wcs/wrappers/tests/test_resampled_wcs.py index 938de51ce..295c8c161 100644 --- a/ndcube/wcs/wrappers/tests/test_resampled_wcs.py +++ b/ndcube/wcs/wrappers/tests/test_resampled_wcs.py @@ -22,11 +22,11 @@ def celestial_wcs(request): This transformation has 2 pixel and 2 world dimensions -Array shape (Numpy order): (np.float64(2.3333333333333335), np.float64(15.0)) +Array shape (Numpy order): (2, 15) Pixel Dim Axis Name Data size Bounds - 0 None 15 (np.float64(-2.5), np.float64(12.5)) - 1 None 2.33333 (np.float64(0.3333333333333333), np.float64(2.3333333333333335)) + 0 None 15 (-2.5, 12.5) + 1 None 2.33333 (0.3333333333333333, 2.3333333333333335) World Dim Axis Name Physical Type Units 0 Right Ascension pos.eq.ra deg diff --git a/tox.ini b/tox.ini index b69f02b96..a3615c741 100644 --- a/tox.ini +++ b/tox.ini @@ -55,11 +55,11 @@ deps = # Oldest Dependencies oldestdeps: minimum_dependencies # Figure tests need a tightly controlled environment - figure-!devdeps: matplotlib==3.7.2 - figure-!devdeps: astropy==5.3.3 - figure-!devdeps: mpl-animators==1.0.0 - figure-!devdeps: scipy + figure-!devdeps: astropy==6.0.0 figure-!devdeps: dask + figure-!devdeps: matplotlib==3.8.2 + figure-!devdeps: mpl-animators==1.1.1 + figure-!devdeps: scipy # The following indicates which extras_require will be installed extras = plotting