1.7.3

Safeguard against nothing arg to isfile in standalone_html_window (#3094 )
Fixes #3093
2020-10-23 09:29:04 +02:00 · 2020-10-23 09:27:22 +02:00 · 2020-10-23 00:06:07 +02:00 · 2020-10-23 00:05:40 +02:00 · 2020-10-22 08:55:15 +02:00 · 2020-10-21 23:20:34 +02:00
6 changed files with 8 additions and 6 deletions
@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.7.0"
+version = "1.7.3"

 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -882,9 +882,8 @@ html_body(plt::Plot{PlotlyBackend}) = plotly_html_body(plt)
 const ijulia_initialized = Ref(false)

 function plotly_html_head(plt::Plot)
-    local_file = ("file:///" * plotly_local_file_path[])
    plotly =
-        use_local_dependencies[] ? local_file : "https://cdn.plot.ly/plotly-1.54.2.min.js"
+        use_local_dependencies[] ? ("file:///" * plotly_local_file_path[]) : "https://cdn.plot.ly/plotly-1.54.2.min.js"

    include_mathjax = get(plt[:extra_plot_kwargs], :include_mathjax, "")
    mathjax_file = include_mathjax != "cdn" ? ("file://" * include_mathjax) : "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-MML-AM_CHTML"
@@ -911,7 +911,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})

            fig = plt.o

-            if RecipesPipeline.is3d(sp)
+            if RecipesPipeline.is3d(sp) || ispolar(sp)
                cbax = fig."add_axes"([0.9, 0.1, 0.03, 0.8])
                cb = fig."colorbar"(handle; cax=cbax, kw...)
            else
@@ -45,7 +45,7 @@ function standalone_html_window(plt::AbstractPlot)
    old = use_local_dependencies[] # save state to restore afterwards
    # if we open a browser ourself, we can host local files, so
    # when we have a local plotly downloaded this is the way to go!
-    use_local_dependencies[] = isfile(plotly_local_file_path[])
+    use_local_dependencies[] = plotly_local_file_path[] === nothing ? false : isfile(plotly_local_file_path[])
    filename = write_temp_html(plt)
    open_browser_window(filename)
    # restore for other backends
@@ -4,7 +4,7 @@ const use_local_plotlyjs = Ref(false)

 function _init_ijulia_plotting()
    # IJulia is more stable with local file
-    use_local_plotlyjs[] = isfile(plotly_local_file_path[])
+    use_local_plotlyjs[] = plotly_local_file_path[] === nothing ? false : isfile(plotly_local_file_path[])

    ENV["MPLBACKEND"] = "Agg"
 end
@@ -11,7 +11,9 @@ import GeometryTypes, GeometryBasics
 using Dates
 using RecipesBase

+
@testset "Plotly standalone" begin
+    @test_nowarn Plots._init_ijulia_plotting()
    @test Plots.plotly_local_file_path[] === nothing
    temp = Plots.use_local_dependencies[]
    withenv("PLOTS_HOST_DEPENDENCY_LOCAL" => true) do
@@ -19,6 +21,7 @@ using RecipesBase
        @test Plots.plotly_local_file_path[] isa String
        @test isfile(Plots.plotly_local_file_path[])
        @test Plots.use_local_dependencies[] = true
+        @test_nowarn Plots._init_ijulia_plotting()
    end
    Plots.plotly_local_file_path[] = nothing
    Plots.use_local_dependencies[] = temp
Author	SHA1	Message	Date
Simon Christ	e95b2a2a8f	1.7.3	2020-10-23 09:29:04 +02:00
Fredrik Bagge Carlson	8ee5ee062e	Safeguard against nothing arg to isfile in standalone_html_window (#3094 ) Fixes #3093	2020-10-23 09:27:22 +02:00
Simon Christ	d34b33b4ae	1.7.2	2020-10-23 00:06:07 +02:00
Simon Christ	fdbeace33a	fix jupyter (#3090 ) * fix jupyter * Update runtests.jl * Update runtests.jl	2020-10-23 00:05:40 +02:00
Daniel Schwabeneder	8dc3d9805a	Merge pull request #3088 from daschw/pyplot-polar fix pyplot polar heatmap size	2020-10-22 08:55:15 +02:00
Daniel Schwabeneder	08932633d0	fix pyplot polar heatmap size	2020-10-21 23:20:34 +02:00
Simon Christ	959fee92a6	1.7.1	2020-10-21 13:19:37 +02:00
Benjamin Lungwitz	70c4954e16	fixed concatinations of string and nothing (#3087 )	2020-10-21 13:18:51 +02:00