Skip to content

Commit

Permalink
DEP: update minimal recommendation for matplotlib (3.3.4 -> 3.6.0) (a…
Browse files Browse the repository at this point in the history
…stropy#16557)

* DEP: update minimal recommendation for matplotlib (3.3.4 -> 3.6.0)
  • Loading branch information
neutrinoceros authored Jun 14, 2024
1 parent 1729742 commit 40ffccb
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ workflows:
matrix:
parameters:
jobname:
- "py310-test-image-mpl334-cov"
- "py310-test-image-mpl360-cov"
- "py310-test-image-mpldev-cov"

- deploy-reference-images:
name: baseline-<< matrix.jobname >>
matrix:
parameters:
jobname:
- "py310-test-image-mpl334-cov"
- "py310-test-image-mpl360-cov"
- "py310-test-image-mpldev-cov"
requires:
- << matrix.jobname >>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_axisbelow[True]": "5364e39cab14f28b08073b31cce3dae8501c0431b1a49985810b764902747c8e",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_axisbelow[False]": "ee1e46856a19ba472ae9ea4588c614fbbd1b3a4a0787ef40e33f991a8f79d6c0",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_axisbelow[line]": "516c3882bbaa31a0d241eec2c70aca45b27b44929662371718b10025735db772",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_contour_overlay": "b3d818b80fd24ccd52fb0633681bf3798a40b824c8182f4d19fa9370d87bce7c",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_contour_overlay": "44fd1a202f8baa894a289bac150b3b0eda9b069a06fc8f49ce14d77e743481e0",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_contourf_overlay": "fa928ab57291e8a128009320323ffb8955cd75d28b2a589074defb7b0889b3eb",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_overlay_features_image": "30d5562cb7a2484db0b898bc886253829de884fbf92bc0e6575f091438ec5f32",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_curvilinear_grid_patches_image": "46b00d038e5a8b4e10b31e8beeee3842fd3c7e355c172c13d6f5f5b23a953dad",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_curvilinear_grid_patches_image": "ad0a985a324a73b5bea839a231f7537075306c874c279c6a6ea2cfe16529d815",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_cube_slice_image": "822d96a93eb4ab59b1a0095384bb315b025b481a18821b3c558e4a937c77f489",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_cube_slice_image_lonlat": "224f7e2f7d106ab028584bdc51c73296e277a211b7f3ed36a0452eb4842afa5b",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_plot_coord": "9352d254af8add2918f98fb8a8d6d220bb95ab8096a1c56584d6c80ff3d5de39",
Expand All @@ -24,13 +24,13 @@
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_ticks_labels": "f4944296c37a6e8ea9d30126709da3567a25908c1665e8cad10e894dd87cd54d",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_no_ticks": "5836f6d36ce6ce89156b251055e5b00b6063a35bff4b7ca1b2da725da14a67ad",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_rcparams": "1af0c66ba343df4f03efc18e707f5b0c2a54dbce7351e0f9024154937a30b371",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_tick_angles": "475f028bd48a51fe9dfc07fe3d58e63e629511fffeb3a4db27a26f6427b4256b",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_tick_angles_non_square_axes": "3a3a15f71e7303368bd7cebb70c6fd1f9d6710edf8af2ceb68642c64c74492a2",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_tick_angles": "11ef218080920301ada1ef9cea558599ca110ba49e3dc4e9dc547c013b87fcc7",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_tick_angles_non_square_axes": "2ffe1157db233bc80e0eda08a30b916cc56a8ff0a7f34c3a0a1b1037695fe1a5",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_set_coord_type": "ee5e873fd467292f7e76f0890051f33762b399fa3936357797e7338f80e914eb",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_ticks_regression": "d295b08d88c6f8cd0eb56f9aa9c1892b6e72e6819a0f5b6265f3a29acb0a1545",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_axislabels_regression": "431b65a14f107dd47c3ea56240b92e246ba25be682f6487c8e8565b78f1fc0c8",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_noncelestial_angular": "cafe2fe3ca40e358ad8e92040c698c1e7f2913968f226a12b635fc47c0acc063",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_patches_distortion": "2a9143579ea6208a64b6957c7f2c3ce355a39f829326c7a76189de7dab8b136c",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_patches_distortion": "704af668b56837628f11b3dedbba60c0d11fda2e896ddbba9dee0e8acb5b99d7",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_quadrangle": "0223dba7d207f37c644c5c0860f6ef18b11b8013438030c89d88d700ea2ed437",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_beam_shape_from_args": "5bb6436777ab08013e747807f7db670b068229d6fb2b6b250787e44eaac36dab",
"astropy.visualization.wcsaxes.tests.test_images.TestBasic.test_beam_shape_from_header": "d7309b91db792bd42fdccd53ebe0738611c7cec56adb2972f0d684d83c8c75f6",
Expand All @@ -47,10 +47,10 @@
"astropy.visualization.wcsaxes.tests.test_images.test_1d_plot_put_varying_axis_on_bottom_lon[slices0-hpln]": "60c967eef03cc2f038d7915f1b988dfa60852fa7b950b83c6d3f49054862d5d1",
"astropy.visualization.wcsaxes.tests.test_images.test_1d_plot_put_varying_axis_on_bottom_lon[slices1-hplt]": "0a14e5153eb91e2a3a96501f02a21581effc7d6b7ae31e29a402a3abf30d5b12",
"astropy.visualization.wcsaxes.tests.test_images.test_allsky_labels_wrap": "8908818b526d4a506505da890eff47121b23ee41656dc15dff3e19f7d03094af",
"astropy.visualization.wcsaxes.tests.test_images.test_tickable_gridlines": "bcd320946307e3099844d3718014b2093212060ec62fa1459058b4498824607a",
"astropy.visualization.wcsaxes.tests.test_transform_coord_meta.TestTransformCoordMeta.test_coords_overlay": "bdb49e3f26611fa4d9cc125dac08e51db216151ae11b59cbf0f1f0192484595d",
"astropy.visualization.wcsaxes.tests.test_transform_coord_meta.TestTransformCoordMeta.test_coords_overlay_auto_coord_meta": "d37e664d20da13c87d865444060ac1363312cf6a2502de4736dc07d9ab0a017f",
"astropy.visualization.wcsaxes.tests.test_transform_coord_meta.TestTransformCoordMeta.test_direct_init": "efffd4e7e96acac88c7f1aaeab8af8721c2b5dbde08a3c9b2153a1b20882e9da",
"astropy.visualization.wcsaxes.tests.test_images.test_tickable_gridlines": "9d91bcf571af6dcc1425b6dfd76fb92e3e0180fb9fd0c852f9eba3fb06e079fc",
"astropy.visualization.wcsaxes.tests.test_transform_coord_meta.TestTransformCoordMeta.test_coords_overlay": "0a87473ff8e5b5610f4adac1518c608afcd2178b25584fb42f77bcc594c4f47a",
"astropy.visualization.wcsaxes.tests.test_transform_coord_meta.TestTransformCoordMeta.test_coords_overlay_auto_coord_meta": "2f737bb70fb1a5452cb0efa79010376614dc559e9aff607f638f044ac6b04448",
"astropy.visualization.wcsaxes.tests.test_transform_coord_meta.TestTransformCoordMeta.test_direct_init": "1f24c5243bfdf0f30e88afc4f2f5d66db85954cea50a2910af94975ff8765b45",
"astropy.visualization.wcsaxes.tests.test_wcsapi.test_wcsapi_5d_with_names": "d2dd2f7efef595a5819906c3f4f77f68d70d29efca5851d19528aecb0e3f8035",
"astropy.visualization.wcsaxes.tests.test_wcsapi.test_wcsapi_2d_celestial_arcsec": "4b743d645a85d7516decbcf4a831c127af5a1800072597c2a1299d17fb186adb"
}
1 change: 1 addition & 0 deletions docs/changes/16557.other.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update minimal recommendation for matplotlib from version 3.3.4 to 3.6.0
4 changes: 2 additions & 2 deletions docs/development/testguide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ hashes and images.

To run the Astropy tests with the image comparison, use e.g.::

tox -e py310-test-image-mpl334-cov
tox -e py310-test-image-mpl360-cov

However, note that the output can be sensitive to the operating system and
specific version of libraries such as freetype. In general, using tox will
Expand Down Expand Up @@ -855,7 +855,7 @@ generate it, you should run the tests the first time with::

for example::

tox -e py310-test-image-mpl334-cov -- --mpl-generate-hash-library=astropy/tests/figures/py310-test-image-mpl334-cov.json
tox -e py310-test-image-mpl360-cov -- --mpl-generate-hash-library=astropy/tests/figures/py310-test-image-mpl360-cov.json

Then add and commit the new JSON file and try running the tests again. The tests
may fail in the continuous integration if e.g. the freetype version does not
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies = [
# Recommended run-time dependencies to enable a lot of functionality within Astropy.
recommended = [
"scipy>=1.8",
"matplotlib>=3.3,!=3.4.0,!=3.5.2",
"matplotlib>=3.6.0",
]
# Optional IPython-related behavior is in many places in Astropy. IPython is a complex
# dependency that occasionally requires pinning one of it's upstream dependencies. If
Expand Down Expand Up @@ -571,9 +571,9 @@ ignore = [
type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/astropy/astropy/blob/main/docs/changes/README.rst)"
number_incorrect_long = "The number in the changelog file you added does not match the number of this pull request. Please rename the file."

[tool.gilesbot.circleci_artifacts.py310-test-image-mpl334]
url = ".tmp/py310-test-image-mpl334/results/fig_comparison.html"
message = "Click details to see the figure test comparisons, for py310-test-image-mpl334."
[tool.gilesbot.circleci_artifacts.py310-test-image-mpl360]
url = ".tmp/py310-test-image-mpl360/results/fig_comparison.html"
message = "Click details to see the figure test comparisons, for py310-test-image-mpl360."
report_on_fail = true

[tool.gilesbot.circleci_artifacts.py310-test-image-mpldev]
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist =
py{310,311,312,dev}-test{,-recdeps,-alldeps,-oldestdeps,-devdeps,-devinfra,-predeps,-numpy123,-numpy124,-numpy125,-mpl334}{,-cov}{,-clocale}{,-fitsio}{,-noscipy}
py{310,311,312,dev}-test{,-recdeps,-alldeps,-oldestdeps,-devdeps,-devinfra,-predeps,-numpy123,-numpy124,-numpy125,-mpl360}{,-cov}{,-clocale}{,-fitsio}{,-noscipy}
# Only these two exact tox environments have corresponding figure hash files.
py310-test-image-mpl334-cov
py310-test-image-mpl360-cov
py310-test-image-mpldev-cov
build_docs
linkcheck
Expand Down Expand Up @@ -50,7 +50,7 @@ description =
numpy124: with numpy 1.24.*
numpy125: with numpy 1.25.*
image: with image tests
mpl334: with matplotlib 3.3.4
mpl360: with matplotlib 3.6.0
mpldev: with the latest developer version of matplotlib
double: twice in a row to check for global state changes
noscipy: without scipy-dev
Expand All @@ -60,7 +60,7 @@ deps =
numpy124: numpy==1.24.*
numpy125: numpy==1.25.*

mpl334: matplotlib==3.3.4
mpl360: matplotlib==3.6.0

image: latex
image: scipy
Expand Down

0 comments on commit 40ffccb

Please sign in to comment.