moar fixes

Author: t-bltg

.github/workflows/ci.yml

@@ -67,31 +67,7 @@ jobs:
       - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@latest
 
-      - name: Install conda based matplotlib
-        shell: julia --project=@. --color=yes {0}
-        run: |
-          using Pkg; Pkg.add("CondaPkg")
-          using CondaPkg; CondaPkg.resolve()
-          libgcc = if Sys.islinux()
-            # see discourse.julialang.org/t/glibcxx-version-not-found/82209/8
-            # julia 1.8.3 is built with libstdc++.so.6.0.29, so we must restrict to this version (gcc 11.3.0, not gcc 12.2.0)
-            # see gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html
-            specs = Dict(
-              v"3.4.29" => ">=11.1,<12.1",
-              v"3.4.30" => ">=12.1,<13.1",
-              v"3.4.31" => ">=13.1,<14.1",
-              v"3.4.32" => ">=14.1,<15.1",
-              v"3.4.33" => ">=15.1,<16.1",
-              # ... keep this up-to-date with gcc 16
-            )[Base.BinaryPlatforms.detect_libstdcxx_version()]
-            ("libgcc-ng$specs", "libstdcxx-ng$specs")
-          else
-            ()
-          end
-          CondaPkg.PkgREPL.add([libgcc..., "matplotlib"])
-          CondaPkg.status()
-
-      - name: develop packages
+      - name: dev pkgs and install mpl deps
         run: |
           ${{ env.JULIA_PROJECT_CMD }} -e '
             using Pkg
@@ -100,6 +76,7 @@ jobs:
               (; path="./RecipesPipeline"),  # compat for LTS [sources], remove later
               (; path="./Plots"),            # compat for LTS [sources], remove later
             ])
+            include(joinpath(@__DIR__, "ci", "matplotlib.jl"))
             Pkg.precompile()  # // precompilation
           '
 

Plots/test/Project.toml

@@ -3,6 +3,7 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 FilePathsBase = "48062228-2e41-5def-b9a4-89aafe57970f"
 FreeType = "b38be410-82b0-50bf-ab77-7b57e271db43"
@@ -17,6 +18,7 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa"
 PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
@@ -25,12 +27,14 @@ PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
 PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
 PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
 PythonPlot = "274fc56d-3b97-40fa-a1cd-1b4a50311bf9"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 RecipesPipeline = "01d81517-befc-4cb6-b9ec-a95719d0359c"
 SentinelArrays = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
@@ -40,9 +44,12 @@ VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
 
 [compat]
 Aqua = "0.8"
+Distributions = "0.25, 1"
 Gaston = "1"
 HDF5 = "0.16 - 0.17"
 InspectDR = "0.4"
+LibGit2 = "1"
+OffsetArrays = "1"
 PGFPlots = "3"
 PGFPlotsX = "1"
 PlotlyBase = "0.7 - 0.8"

ci/matplotlib.jl

@@ -30,12 +30,18 @@ libgcc = if Sys.islinux()
     # julia 1.8.3 is built with libstdc++.so.6.0.29, so we must restrict to this version (gcc 11.3.0, not gcc 12.2.0)
     versions = Dict(_compatible_libstdcxx_ng_versions)
     lo, hi = extrema(keys(versions))
-    _, ub = versions[Base.BinaryPlatforms.detect_libstdcxx_version(Int(hi.patch))]
-    specs = ">=$(VersionNumber(lo.major, lo.minor)),$ub"
-    ("libgcc-ng$specs", "libstdcxx-ng$specs")
+    libstdcxx_version = Base.BinaryPlatforms.detect_libstdcxx_version(Int(hi.patch))
+    @info libstdcxx_version
+    if libstdcxx_version ≢ nothing
+        _, ub = versions[libstdcxx_version]
+        specs = ">=$(VersionNumber(lo.major, lo.minor)),$ub"
+        ("libgcc-ng$specs", "libstdcxx-ng$specs")
+    else
+        ()
+    end
 else
     ()
 end
 
-CondaPkg.PkgREPL.add([libgcc..., "matplotlib>=3.4"])  # "openssl>=3.4"
+CondaPkg.PkgREPL.add([libgcc..., "matplotlib>=3.10"])  # "openssl>=3.4"
 CondaPkg.status()

docs/src/GraphRecipes/examples.md

@@ -36,7 +36,6 @@ graphplot(A,
            linecolor = :darkgrey,
            linealpha = 0.5
        )
-
 ```
 
 ### Graphs.jl
@@ -66,11 +65,11 @@ graphplot(g, names=1:3, curvature_scalar=0.1)
 Edge labels can be passed via the `edgelabel` keyword argument. You can pass edge labels
 as a dictionary of `(si::Int, di::Int) => label`, where `si`, `di` are the indices of the source and destiny nodes for the edge being labeled. Alternatively, you can pass a matrix or a vector of labels. `graphplot` will try to convert any label you pass it into a string unless you pass one of `missing`, `NaN`, `nothing`, `false` or `""`, in which case, `graphplot` will skip the label.
 
-```@example graphexamples
+```@example
 using GraphRecipes, Plots
 using Graphs
 
-n = 8
+const n = 8
 g = wheel_digraph(n)
 edgelabel_dict = Dict()
 edgelabel_mat = Array{String}(undef, n, n)
@@ -85,7 +84,7 @@ graphplot(g, names=1:n, edgelabel=edgelabel_dict, curves=false, nodeshape=:rect)
 ```
 
 #### Self edges
-```@example graphexamples
+```@example
 using Graphs, Plots, GraphRecipes
 
 g = [1 1 1;
@@ -96,13 +95,14 @@ graphplot(DiGraph(g), self_edge_size=0.2)
 ```
 
 #### Multigraphs
-```@example graphexamples
+```@example
+using Graphs, Plots, GraphRecipes
 graphplot([[1,1,2,2],[1,1,1],[1]], names="node_".*string.(1:3), nodeshape=:circle, self_edge_size=0.25)
 ```
 
 #### Arc and chord diagrams
 
-```@example graphexamples
+```@example
 using LinearAlgebra
 using SparseArrays
 using GraphRecipes
@@ -129,7 +129,7 @@ plot(
 
 #### Julia code -- AST
 
-```@example graphexamples
+```@example
 using GraphRecipes
 using Plots
 default(size=(1000, 1000))
@@ -150,7 +150,7 @@ plot(code, fontsize=12, shorten=0.01, axis_buffer=0.15, nodeshape=:rect)
 
 #### Julia Type Trees
 
-```@example graphexamples
+```@example
 using GraphRecipes
 using Plots
 default(size=(1000, 1000))