Skip to content

Commit

Permalink
Merge pull request #761 from Cadair/cruft-manual-update
Browse files Browse the repository at this point in the history
Updates from package template
  • Loading branch information
nabobalis committed Sep 11, 2024
2 parents 00e4a6b + d7f8bc7 commit f38dde5
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
jobname:
type: string
docker:
- image: cimg/python:3.10
- image: cimg/python:3.12
environment:
TOXENV=<< parameters.jobname >>
steps:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/sunpy/package-template",
"commit": "67ea3b3815de57668e92dbe1fa2c3d033758d8f0",
"commit": "c0e51ac3283d88346534da0aac441f37f624b283",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sub_package_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
6 changes: 3 additions & 3 deletions ndcube/wcs/wrappers/tests/test_resampled_wcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f38dde5

Please sign in to comment.