Skip to content

Commit 904535d

Browse files
authored
Merge pull request #107 from Cadair/cruft-manual-update
2 parents 8c66bd5 + 1892141 commit 904535d

8 files changed

Lines changed: 46 additions & 42 deletions

File tree

.circleci/config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ jobs:
8686
8787
8888
all-jobs: &all-jobs
89-
- "py311-figure"
89+
- "py312-figure"
9090
- "py313-figure-devdeps"
91-
- "py310-figure-oldestdeps"
91+
- "py312-figure-oldestdeps"
9292

9393
main-branch: &main-branch
9494
branches:
@@ -104,24 +104,24 @@ workflows:
104104
# IF YOU CHANGE THESE BUILDS UPDATE THE GILES CONFIG IN pyproject.toml
105105
jobs:
106106
- figure:
107-
name: "py311-figure"
108-
jobname: "py311-figure"
109-
image: "cimg/python:3.11"
107+
name: "py312-figure"
108+
jobname: "py312-figure"
109+
image: "cimg/python:3.12"
110110

111111
- figure:
112112
name: "py313-figure-devdeps"
113113
jobname: "py313-figure-devdeps"
114114
image: "cimg/python:3.13"
115115

116116
- figure:
117-
name: "py310-figure-oldestdeps"
118-
jobname: "py310-figure-oldestdeps"
119-
image: "cimg/python:3.10"
117+
name: "py312-figure-oldestdeps"
118+
jobname: "py312-figure-oldestdeps"
119+
image: "cimg/python:3.12"
120120

121121
- deploy-reference-images:
122-
name: "baseline-py311-figure"
123-
jobname: "py311-figure"
124-
image: "cimg/python:3.11"
122+
name: "baseline-py313-figure"
123+
jobname: "py313-figure"
124+
image: "cimg/python:3.13"
125125
requires: *all-jobs
126126
filters: *main-branch
127127

@@ -133,8 +133,8 @@ workflows:
133133
filters: *main-branch
134134

135135
- deploy-reference-images:
136-
name: "baseline-py310-figure-oldestdeps"
137-
jobname: "py310-figure-oldestdeps"
138-
image: "cimg/python:3.10"
136+
name: "baseline-py312-figure-oldestdeps"
137+
jobname: "py312-figure-oldestdeps"
138+
image: "cimg/python:3.12"
139139
requires: *all-jobs
140140
filters: *main-branch

.cruft.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/sunpy/package-template",
3-
"commit": "7958151d0246956f1e95889e8e3fa5abc4a3a129",
3+
"commit": "bea8060eef60df35f7df61d9db1d56b838bda01a",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -17,7 +17,7 @@
1717
"changelog_url": "https://github.com/sunpy/mpl-animators/releases",
1818
"issue_tracker_url": "https://github.com/sunpy/mpl-animators/issues",
1919
"license": "BSD 3-Clause",
20-
"minimum_python_version": "3.10",
20+
"minimum_python_version": "3.12",
2121
"use_compiled_extensions": "n",
2222
"enable_dynamic_dev_versions": "y",
2323
"include_example_code": "n",
@@ -32,7 +32,7 @@
3232
".github/workflows/sub_package_update.yml"
3333
],
3434
"_template": "https://github.com/sunpy/package-template",
35-
"_commit": "7958151d0246956f1e95889e8e3fa5abc4a3a129"
35+
"_commit": "bea8060eef60df35f7df61d9db1d56b838bda01a"
3636
}
3737
},
3838
"directory": null

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
envs: |
3838
- windows: py313
3939
- macos: py312
40-
- linux: py311
40+
- linux: py313
4141
secrets:
4242
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4343

.ruff.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ select = [
1818
extend-ignore = [
1919
# pycodestyle (E, W)
2020
"E501", # ignore line length will use a formatter instead
21-
# pyupgrade (UP)
22-
"UP038", # Use | in isinstance - not compatible with models and is slower
2321
# pytest (PT)
2422
"PT001", # Always use pytest.fixture()
2523
"PT023", # Always use () on pytest decorators

changelog/107.breaking.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Increased to the follow minimum versions:
2+
3+
- Python 3.12
4+
- NumPy 1.26.0
5+
- astropy 6.1.0
6+
- matplotlib 3.8.0

mpl_animators/tests/figure_hashes_mpl_350_ft_261_astropy_53.json renamed to mpl_animators/tests/figure_hashes_mpl_380_ft_261_astropy_610.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"mpl_animators.tests.test_basefuncanimator.test_lineanimator_figure": "6865a446680cb7088d71becd653e3c9e9e8e982d71956c95f690d52365bfe106",
3-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_simple_plot": "1d0b9c13e72d288e09d1ab85fe3b4df38d6b349eae661c54cf32c18f0af451c6",
4-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_clip_interval": "a78d4ca84423abcde116efeef4631cdf36d98033c71ad038363a033857743776",
3+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_simple_plot": "7cf4b83a10ff179afd40d142860edfac340b922f42647eeae5ae9426627a6c63",
4+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_clip_interval": "f03cf2632d825991cdfa5c5a15542fc53dc3a90d29cb21dabe858365f3f8c4b1",
55
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_celestial_sliders": "14fc82e6778a7725092a691f210f05420e5669099fe8cb21260fd44336e57f8e",
6-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_update_plot": "0c4a39742b55c4c9eb1336de59891c1e1459e656992505528f245783e4c7cf12",
7-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_transpose_update_plot": "fca79fbb72e9650df3e64beb383b68a7816cfdfd95fa632386f65b5e6d32b5e4",
8-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_colorbar_buttons": "dc5d08188e888fb6b93843b38a1604b8847aec38dc1ba53fa8ef108da6e790d6",
9-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_colorbar_buttons_default_labels": "3026f941a8cf87347e6793b6002dda370eae6036e13961ae7323c3a4fe60d1d1",
10-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_extra_sliders": "fd94e25c0b6a813818c8ab1b42c6d8828e546acf30ea9bc73164e50b22f456ba",
6+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_update_plot": "6d328b74049bb415245901d033efdc103b55b11156a94e483da3c54615057c4b",
7+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_transpose_update_plot": "eca32f981221be9268155d12c3662891951516ea1166a9a17c239eedb4b28c92",
8+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_colorbar_buttons": "1ac74e4adb0fca87e99dee372842302130a90b8c5d2547b4ed9e14a60c9b8e96",
9+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_colorbar_buttons_default_labels": "7dd4f77842219e790df3297773e581382164b00f0dc72c40379f5fca33ed4c36",
10+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_2d_extra_sliders": "67fb82ca58a293bbcebcc06432a919c1aed54fb671a0be0e9d9289645d7897c0",
1111
"mpl_animators.tests.test_wcs.test_array_animator_wcs_1d_update_plot": "0618fba2b4285904d3594b4b3d76ebd56337cf2ad4c00aa568ac111f6d3e52aa",
1212
"mpl_animators.tests.test_wcs.test_array_animator_wcs_1d_update_plot_masked": "ae635463aaa2da4d494e9e90f040d39adf452eda92ad5f1c988b5be0bf437185",
13-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_coord_params": "6535c5d4c7cfb9699bf99c4ad1919e9854626c5633eaa4d9aa97d5003408634a",
13+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_coord_params": "ba389aca68e8cba9fcaf2e966cc909fba7b7f3e4ba4d65ad3035dae9c8056d57",
1414
"mpl_animators.tests.test_wcs.test_array_animator_wcs_coord_params_no_ticks": "536034d8e761ef5d2fdfbf8911c4ab9bbc96308328594befb44d0837eccd671e",
15-
"mpl_animators.tests.test_wcs.test_array_animator_wcs_coord_params_grid": "5b81acf2215c9b8c1a700e2e7371f43be3177363abfe9729b6746eedd7d16686"
15+
"mpl_animators.tests.test_wcs.test_array_animator_wcs_coord_params_grid": "6dacd902ec7ac3e9b34dac8554ef2a83a5b3a12ad5ddf63858511ac6fe02d417"
1616
}

pyproject.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ build-backend = "setuptools.build_meta"
99
[project]
1010
name = "mpl_animators"
1111
description = "An interactive animation framework for matplotlib."
12-
requires-python = ">=3.10"
12+
requires-python = ">=3.12"
1313
readme = { file = "README.rst", content-type = "text/x-rst" }
1414
license = { file = "licenses/LICENSE.rst" }
1515
authors = [
1616
{ name = "The SunPy Developers", email = "sunpy@googlegroups.com" },
1717
]
1818
dependencies = [
19-
"matplotlib>=3.5.0",
20-
"numpy>=1.23.0",
19+
"matplotlib>=3.8.0",
20+
"numpy>=1.26.0",
2121
]
2222
dynamic = ["version"]
2323

2424
[project.optional-dependencies]
2525
wcs = [
26-
"astropy>=5.3.0",
26+
"astropy>=6.1.0",
2727
]
2828
tests = [
2929
"pytest",
@@ -75,14 +75,14 @@ version_file = "mpl_animators/_version.py"
7575
[ tool.gilesbot.circleci_artifacts ]
7676
enabled = true
7777

78-
[ tool.gilesbot.circleci_artifacts.py311-figure_report ]
79-
url = ".tmp/py311-figure/figure_test_images/fig_comparison.html"
80-
message = "Click details to see the figure test comparisons, for py311-figure."
78+
[ tool.gilesbot.circleci_artifacts.py313-figure_report ]
79+
url = ".tmp/py313-figure/figure_test_images/fig_comparison.html"
80+
message = "Click details to see the figure test comparisons, for py313-figure."
8181
report_on_fail = true
8282

83-
[ tool.gilesbot.circleci_artifacts.py310-figure-oldestdeps_report ]
84-
url = ".tmp/py310-figure-oldestdeps/figure_test_images/fig_comparison.html"
85-
message = "Click details to see the figure test comparisons for py310-figure-oldestdeps."
83+
[ tool.gilesbot.circleci_artifacts.py312-figure-oldestdeps_report ]
84+
url = ".tmp/py312-figure-oldestdeps/figure_test_images/fig_comparison.html"
85+
message = "Click details to see the figure test comparisons for py312-figure-oldestdeps."
8686
report_on_fail = true
8787

8888
[ tool.gilesbot.circleci_artifacts.py313-figure-devdeps_report ]

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ min_version = 4.0
33
requires =
44
tox-pypi-filter>=0.14
55
envlist =
6-
py{310,311,312,313}-{figure}
7-
py313-devdeps
8-
py310-oldestdeps
6+
py{312,313,314}-{figure}
7+
py314-devdeps
8+
py312-oldestdeps
99
codestyle
1010
build_docs
1111
codestyle

0 commit comments

Comments
 (0)