Skip to content

Commit

Permalink
Merge branch 'main' of github.com:DKISTDC/dkist into fix-build
Browse files Browse the repository at this point in the history
  • Loading branch information
SolarDrew committed Oct 21, 2024
2 parents b28b6da + af56c3a commit 243e028
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,18 @@ workflows:
parameters:
jobname:
- "py312-figure"
- "py312-figure-devdeps"

- deploy-reference-images:
name: baseline-<< matrix.jobname >>
matrix:
parameters:
jobname:
- "py312-figure"
- "py312-figure-devdeps"
requires:
- << matrix.jobname >>
filters:
branches:
only:
- main
- figuretests
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"dkist.dataset.tests.test_plotting.test_dataset_projection[aslice0]": "f3cd5b87ef5d109090bf3183c7edbcdd8398d083417b2564991c4515bddbc8bf",
"dkist.dataset.tests.test_plotting.test_dataset_projection[aslice1]": "753909f9ae5d03a03d18513783c22501784460d7f93851fd40e8ddfd493dcb6c",
"dkist.dataset.tests.test_plotting.test_dataset_projection[aslice2]": "0a29ef8f286f16acf7d5ab420da6970d632ce44c1f11cfd6eb3b4c5e15c7f23a",
"dkist.dataset.tests.test_plotting.test_2d_plot[aslice0]": "b31423d5ec45941849564f4ec7e276f2c52a0fa5038ce0b3c8d4af1b7f848a1d",
"dkist.dataset.tests.test_plotting.test_2d_plot[aslice1]": "cbb84fbae51d8238803f8f0d6820c575f024fe54b1656f1b181dc4ec645e9ff9",
"dkist.dataset.tests.test_plotting.test_2d_plot[aslice2]": "132c5615832daff457dacb4cb770498f1fbb4460a5b90b5d4d01d224c70eeb28",
"dkist.dataset.tests.test_plotting.test_2d_plot2": "409b5a10ad8ccf005331261505e63ce8febdc38eb8b5a34f8863e567e3cccb9c",
"dkist.dataset.tests.test_tiled_dataset.test_tileddataset_plot[share_zscale]": "0687c12c0a90fd35a892b1825ae8f95614507982f28ea5c8f62422745aaf0ef3",
"dkist.dataset.tests.test_tiled_dataset.test_tileddataset_plot[indpendent_zscale]": "a0a76d5bc02795722046d2079d4809fe18744df955ea55265062f162312da8a7"
}
9 changes: 8 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,14 @@ write_to = "dkist/_version.py"
enabled = true

[ tool.gilesbot.circleci_artifacts.figure_report]
url = ".tmp/py312-figure/figure_test_images/fig_comparison.html"
url = "py312-figure/figure_test_images/fig_comparison.html"
message = "Click details to see the figure test comparisons, for py312-figure."
report_on_fail = true

[ tool.gilesbot.circleci_artifacts.figure_devdeps_report]
url = "py312-figure-devdeps/figure_test_images/fig_comparison.html"
message = "Click details to see the figure test comparisons, for py312-figure-devdeps."
report_on_fail = true

[tool.towncrier]
package = "dkist"
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ deps =
devdeps: git+https://github.com/spacetelescope/gwcs
devdeps: git+https://github.com/asdf-format/asdf
devdeps: git+https://github.com/astropy/asdf-astropy
devdeps: git+https://github.com/sunpy/mpl-animators
# Autogenerate oldest dependencies from info in setup.cfg
oldestdeps: minimum_dependencies
figure: matplotlib==3.9.1
figure: mpl_animators==1.1.1
figure: astropy==6.1.1
figure: ndcube==2.2.2
figure-!devdeps: matplotlib==3.9.1
figure-!devdeps: mpl-animators==1.1.1
figure-!devdeps: astropy==6.1.1
figure-!devdeps: ndcube==2.2.2
# The following indicates which extras_require will be installed
extras =
tests
Expand Down

0 comments on commit 243e028

Please sign in to comment.