Skip to content

Commit

Permalink
CI fixes (#4974)
Browse files Browse the repository at this point in the history
* Update tests for Latexify 0.16.5

Behaviour was changed such that ã becomes \tilde{a}, instead of
\textnormal{\~{a}}.

* Test Julia 1.6 on x86 macOS instead of ARM

See: https://discourse.julialang.org/t/how-to-fix-github-actions-ci-failures-with-julia-1-6-or-1-7-on-macos-latest-and-macos-14/117019

* Bump GR compat and Plots version number

* update plotly show methods for PlotlyKaleido v2

* remove Pkg

* add it back

---------

Co-authored-by: Simon Christ <[email protected]>
  • Loading branch information
penelopeysm and BeastyBlacksmith authored Aug 28, 2024
1 parent 702c592 commit 288372d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 19 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,15 @@ jobs:
- false
os: [ubuntu-latest, windows-latest, macos-latest]
arch: [x64]
exclude:
# No native binaries for Julia 1.6 on ARM macOS
- os: macos-latest
version: '1.6'
include:
# In its place, test Julia 1.6 on x86 macOS
- os: macos-13
experimental: false
version: '1.6'
- os: ubuntu-latest
experimental: false
prefix: xvfb-run # julia-actions/julia-runtest/blob/master/README.md
Expand Down
34 changes: 17 additions & 17 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Plots"
uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
author = ["Tom Breloff (@tbreloff)"]
version = "1.40.7"
version = "1.40.8"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down Expand Up @@ -41,13 +41,27 @@ UnicodeFun = "1cfade01-22cf-5700-b092-accc4b62d6e1"
UnitfulLatexify = "45397f5d-5981-4c77-b2b3-fc36d6e9b728"
Unzip = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"

[weakdeps]
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[extensions]
FileIOExt = "FileIO"
GeometryBasicsExt = "GeometryBasics"
IJuliaExt = "IJulia"
ImageInTerminalExt = "ImageInTerminal"
UnitfulExt = "Unitful"

[compat]
Aqua = "0.8"
Contour = "0.5 - 0.6"
Downloads = "1"
FFMPEG = "0.3, 0.4"
FixedPointNumbers = "0.6 - 0.8"
GR = "0.69.5 - 0.73"
GR = "0.73"
Gaston = "1"
HDF5 = "0.16 - 0.17"
InspectDR = "0.5"
Expand All @@ -63,7 +77,7 @@ PlotThemes = "2, 3"
PlotUtils = "1"
PlotlyBase = "0.7 - 0.8"
PlotlyJS = "0.18"
PlotlyKaleido = "1"
PlotlyKaleido = "1,2"
PrecompileTools = "1"
PyPlot = "2"
PythonPlot = "1"
Expand All @@ -82,13 +96,6 @@ UnitfulLatexify = "1"
Unzip = "0.1 - 0.2"
julia = "1.6"

[extensions]
FileIOExt = "FileIO"
GeometryBasicsExt = "GeometryBasics"
IJuliaExt = "IJulia"
ImageInTerminalExt = "ImageInTerminal"
UnitfulExt = "Unitful"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
Expand Down Expand Up @@ -125,10 +132,3 @@ VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"

[targets]
test = ["Aqua", "Colors", "Distributions", "FileIO", "FilePathsBase", "FreeType", "Gaston", "GeometryBasics", "Gtk", "ImageMagick", "Images", "LibGit2", "OffsetArrays", "PGFPlotsX", "PlotlyJS", "PlotlyBase", "PyPlot", "PythonPlot", "PlotlyKaleido", "HDF5", "RDatasets", "SentinelArrays", "StableRNGs", "StaticArrays", "StatsPlots", "Test", "TestImages", "UnicodePlots", "Unitful", "VisualRegressionTests"]

[weakdeps]
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
6 changes: 5 additions & 1 deletion src/backends/plotlybase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ for (mime, fmt) in (
"image/svg+xml" => "svg",
"image/eps" => "eps",
)
@eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyBackend}) =
@eval function _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyBackend})
if !PlotlyKaleido.is_running()
PlotlyKaleido.restart()
end
PlotlyKaleido.savefig(io, plotlybase_syncplot(plt), format = $fmt)
end
end
2 changes: 1 addition & 1 deletion test/test_pgfplotsx.jl
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ Plots.with(:pgfplotsx) do
@test Plots.pgfx_sanitize_string("A string, with 2 punctuation chars.") ==
"A string, with 2 punctuation chars."
@test Plots.pgfx_sanitize_string("Interpolação polinomial") ==
raw"Interpola$\textnormal{\c{c}}$$\textnormal{\~{a}}$o polinomial"
raw"Interpola$\textnormal{\c{c}}$$\tilde{a}$o polinomial"
@test Plots.pgfx_sanitize_string("∫∞ ∂x") == raw"$\int$$\infty$ $\partial$x"

# special LaTeX characters
Expand Down

2 comments on commit 288372d

@BeastyBlacksmith
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/114012

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.40.8 -m "<description of version>" 288372dbe5df332d9b8cc53048beac4284b54229
git push origin v1.40.8

Please sign in to comment.