Plots 2.0

.JuliaFormatter.toml

@@ -1,3 +1,4 @@
+for_in_replacement = "∈"
 always_for_in = true
 import_to_using = false
 align_pair_arrow = true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,3 @@
-<!-- Plots is in a 2.0 transition phase. Consider (also) targeting the v2 branch with this change -->
 ## Description
 
 ## Attribution

.github/workflows/CompatHelper.yml

@@ -1,6 +1,7 @@
 name: CompatHelper
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '00 00 * * *'
 

.github/workflows/benchmark.yml

@@ -1,7 +1,9 @@
 name: benchmarks
 
 on:
+  workflow_dispatch:
   pull_request:
+    branches: [master]
 
 concurrency: 
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci.yml

@@ -1,9 +1,10 @@
 name: ci
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
-    branches: [master]
+    branches: [master, v2]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -17,56 +18,40 @@ jobs:
   ci:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     env:
-      GKS_ENCODING: "utf8"
-      GKSwstype: "nul"
-      JULIA_CONDAPKG_BACKEND: "MicroMamba"
-      MPLBACKEND: "agg"
+      JULIA_CONDAPKG_BACKEND: MicroMamba
+      MPLBACKEND: agg
+      GKS_ENCODING: utf8
+      GKSwstype: nul
     name: Julia ${{ matrix.version }} - ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
-          - '1.6' # LTS (minimal declared julia compat in `Project.toml`)
-          - '1' # latest stable
+          - '1'  # latest stable
+          - '1.10'  # minimal declared julia compat in `Project.toml`
         experimental:
           - false
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest]
         arch: [x64]
         include:
-          - os: ubuntu-latest
-            experimental: false
-            prefix: xvfb-run  # julia-actions/julia-runtest/blob/master/README.md
-          - os: ubuntu-latest
-            experimental: false
-            prefix: xvfb-run
-            version:  '1.7' # only test intermediate release on `ubuntu` to spare resources
-          - os: ubuntu-latest
-            experimental: false
-            prefix: xvfb-run
-            version:  '1.8' # only test intermediate release on `ubuntu` to spare resources
-          - os: ubuntu-latest
-            experimental: false
-            prefix: xvfb-run
-            version:  '1.9' # only test intermediate release on `ubuntu` to spare resources
-          - os: ubuntu-latest
-            experimental: true
-            prefix: xvfb-run
-            version: '~1.11.0-0'  # upcoming julia version, next `rc`
           - os: ubuntu-latest
             experimental: true
-            prefix: xvfb-run
-            version: 'nightly'
-
+            version: 'pre'  # upcoming julia version (`alpha`, `beta` or `rc`)
+          - os: macOS-latest
+            arch: aarch64
+            version: '1'
+            experimental: false
+
     steps:
       - uses: actions/checkout@v4
 
       - name: Ubuntu LaTeX dependencies
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install gnuplot poppler-utils texlive-{latex-base,latex-extra,luatex} g++
+          sudo apt-get -y install g++ gnuplot poppler-utils texlive-{latex-base,latex-extra,luatex} 
           sudo fc-cache -vr
 
       - name: Set LD_PRELOAD
@@ -76,64 +61,56 @@ jobs:
       - uses: julia-actions/setup-julia@latest
         with:
           version: ${{ matrix.version }}
-      - uses: julia-actions/cache@v1
-      - uses: julia-actions/julia-buildpkg@latest
 
-      - name: Run upstream RecipesBase & RecipesPipeline tests
-        shell: julia --project=@. --color=yes {0}
+      - uses: julia-actions/cache@v2
+
+      - name: Develop all Plots packages
+        env:
+          JULIA_PKG_PRECOMPILE_AUTO: 0
+        shell: julia --color=yes {0}
         run: |
           using Pkg
-          foreach(("RecipesBase", "RecipesPipeline")) do name
-            Pkg.develop(path=name); Pkg.test(name; coverage=true)
-          end
+          Pkg.develop([
+            (; path="./RecipesBase"),
+            (; path="./RecipesPipeline"),
+            (; path="./PlotThemes"),
+            (; path="./PlotsBase"),
+            (; path="./GraphRecipes"),
+            (; path="./StatsPlots"),
+            (; path="."),
+          ])
 
       - 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()
+        env:
+          JULIA_PKG_PRECOMPILE_AUTO: 0
+        run: julia --color=yes ci/matplotlib.jl
 
-      - uses: julia-actions/julia-runtest@latest
+      - name: Test all Plots packages
         timeout-minutes: 60
-        with:
-          prefix: ${{ matrix.prefix }}  # for `xvfb-run`
-
-      - name: Run downstream tests
-        if: startsWith(matrix.os, 'ubuntu')
-        shell: xvfb-run julia --project=@. --color=yes {0}
         run: |
-          using Pkg
-          foreach(("StatsPlots", "GraphRecipes")) do name
-            Pkg.activate(tempdir())
-            foreach(path -> Pkg.develop(; path), ("RecipesBase", "RecipesPipeline", "."))
-            Pkg.add(name); Pkg.test(name; coverage=true)
-          end
-
+          cmd=(julia --color=yes)
+          if [ "$RUNNER_OS" == "Linux" ]; then
+            cmd=(xvfb-run ${cmd[@]})
+          fi
+          echo ${cmd[@]}
+          ${cmd[@]} -e 'using Pkg; Pkg.test([
+            "RecipesBase",
+            "RecipesPipeline",
+            "PlotThemes",
+            "PlotsBase",
+            "GraphRecipes",
+            "StatsPlots",
+            "Plots",
+          ]; coverage=true)'
       - uses: julia-actions/julia-processcoverage@latest
         if: startsWith(matrix.os, 'ubuntu')
         with:
-          directories: RecipesBase/src,RecipesPipeline/src,src
-      - uses: codecov/codecov-action@v4
+          directories: RecipesBase/src,RecipesPipeline/src,PlotsBase/src,src,GraphRecipes/src,StatsPlots/src,PlotThemes/src
+      - uses: codecov/codecov-action@v5
         if: startsWith(matrix.os, 'ubuntu')
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
           file: lcov.info
 
   Skip:

.github/workflows/codespell.yml

@@ -0,0 +1,17 @@
+name: codespell
+
+on: [pull_request]
+
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: codespell-project/actions-codespell@v2
+      with:
+        ignore_words_list: nd,nax,namin,namax,linez,ist
+        only_warn: 0

.github/workflows/docs.yml

@@ -3,16 +3,14 @@ name: docs
 on:
  workflow_dispatch:
  push:
-  branches: [master]
+  branches: [v2]
   tags: '*'
 
 jobs:
   Build_docs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          repository: JuliaPlots/PlotDocs.jl
       - uses: julia-actions/setup-julia@latest
       - name: Cache artifacts
         uses: actions/cache@v4
@@ -30,4 +28,4 @@ jobs:
           PYTHON: ""
           DOCUMENTER_KEY: ${{secrets.DOCUMENTER_KEY}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: bash docs/ci_build.sh
+        run: bash ci/build-docs.sh

.github/workflows/format_check.yml

@@ -1,9 +1,10 @@
 name: format
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
-    branches: [master]
+    branches: [master, v2]
 
 concurrency: 
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -15,44 +16,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@latest
-      - name: Install dependencies
+      - name: format Julia files
         run: |
-          using Pkg
-          Pkg.add([
-              PackageSpec("JuliaFormatter"),
-              PackageSpec(url = "https://github.com/tkf/JuliaProjectFormatter.jl.git"),
-          ])
-        shell: julia --color=yes {0}
-
-      - name: Format Julia files
-        run: |
-          using JuliaFormatter
-          format(["RecipesBase", "RecipesPipeline", "src", "test", "ext"])
-        shell: julia --color=yes --compile=min -O0 {0}
-      - name: suggester / JuliaFormatter
+          julia --color=yes --compile=min -O0 -e '
+            using Pkg; Pkg.add("JuliaFormatter")
+            using JuliaFormatter
+            format(["RecipesBase", "RecipesPipeline", "PlotsBase", "src", "test", "GraphRecipes", "StatsPlots", "PlotThemes"])
+          '
+      - name: suggester
+        if: success() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v2' )
         uses: reviewdog/action-suggester@v1
         with:
           tool_name: JuliaFormatter
           fail_on_error: true
 
       # reviewdog/action-suggester not using `cleanup` flag?
-      - name: Cleanup
+      - name: cleanup
         if: success() || failure()
         run: |
           git checkout -- .
           git clean --force
         shell: bash
-
-      # temporarily disable `JuliaProjectFormatter` until github.com/tkf/JuliaProjectFormatter.jl/pull/7 is merged
-      # - name: Format Julia project files
-      #   if: success() || failure()
-      #   run: |
-      #     using JuliaProjectFormatter
-      #     format_projects()
-      #   shell: julia --color=yes --compile=min -O0 {0}
-      # - name: suggester / JuliaProjectFormatter
-      #   if: success() || failure()
-      #   uses: reviewdog/action-suggester@v1
-      #   with:
-      #     tool_name: JuliaProjectFormatter
-      #     fail_on_error: true

.github/workflows/format_pr.yml

@@ -1,6 +1,7 @@
 name: format
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 0 1 * *'
 
@@ -19,7 +20,7 @@ jobs:
       - name: Create Pull Request
         if: ${{ failure() }}
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Format .jl files [skip ci]"

.gitignore

@@ -13,4 +13,9 @@ test/tmpplotsave.hdf5
 /.benchmarkci
 /benchmark/*.json
 .vscode/
-.CondaPkg/
+.CondaPkg/
+
+# docs
+**/generated/
+docs/build/
+docs/work/