Merge branch 'master' into fa/fix-polygon-interiors

.codecov.yml

@@ -1 +1,4 @@
 comment: false
+coverage:
+ status:
+ project: false

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
-github: [SimonDanisch]
-patreon: # Replace with a single Patreon username
+github: [MakieOrg, SimonDanisch]
+patreon: SimonDanisch # Replace with a single Patreon username
 open_collective: simon-danisch
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/ISSUE_TEMPLATE/bug-report-.md

@@ -0,0 +1,12 @@
+---
+name: 'Bug report '
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+- [ ] what version of Makie are you running? (`]st -m Makie`)
+- [ ] can you reproduce the bug with a fresh environment ? (`]activate --temp; add Makie`)
+- [ ] What platform + GPU are you on?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,12 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+### Feature description
+
+### For plot types, please add an image of how it should look like

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,27 @@
+<!--
+* Any PR that is not ready for review should be created as a draft PR.
+* Please don't force push to PRs, it removes the history, creates bad notifications, and we will squash and merge in the end anyways.
+* Feel free to ping for a review when it passes all tests after a few days (@simondanisch, @ffreyer). We can't guarantee a review in a certain time frame, but we can guarantee to forget about PRs after a while.
+* Allowing write access on the PR makes things more convenient, since we can make edits to the PR directly and update it if it gets out of sync with `master` (should be automatic if not disabled).
+* Please understand, that some PRs will take very long to get merged. You can do a few things to optimize the time to get it merged:
+ * The more tests you add, the easier it is to see that your change works without putting the work on us.
+ * The clearer the problem being solved the easier. A PR best only addresses one bug fix or feature.
+ * The more you explain the motivation or describe your feature (best with pictures), the easier it will be for us to priorize the PR.
+ * Changes with more ambigious benefits are best discussed in a github [discussion](https://github.com/MakieOrg/Makie.jl/discussions) before a PR.
+* What deserves a unit test or a reference image test isn't easy to decide, but here are a few pointers:
+ * Makie unit tests are preferable, since they're fast to execute and easy to maintain, so if you can add tests to `Makie/src/test`
+ * For new recipes or any changes that may get rendered differently by the backends, one should add a reference image test to the best fitting file in `Makie\ReferenceTests\src\tests\**` looking like this:
+ ```julia 
+ @reference_test "name of test" begin
+ # code of test
+ ...
+ # make sure the last line is a Figure, FigureAxisPlot or Scene
+ end
+ ``` 
+ Adding a reference image test will let your PR fail with the status "n reference images missing", which a maintainer will need to approve and fix. 
+ Ideally, a comment with a screenshot of the expected output of the reference image test should be added to the PR.
+ We prefer one reference image test with many subplots over multiple reference image tests.
+-->
 # Description
 
 Fixes # (issue)
@@ -14,7 +38,7 @@ Delete options that do not apply:
 
 ## Checklist
 
-- [ ] Added an entry in NEWS.md (for new features and breaking changes)
+- [ ] Added an entry in CHANGELOG.md (for new features and breaking changes)
 - [ ] Added or changed relevant sections in the documentation
 - [ ] Added unit tests for new algorithms, conversion methods, etc.
 - [ ] Added reference image tests for new plotting functions, recipes, visual options, etc.

.github/workflows/CompatHelper.yml

@@ -1,18 +1,45 @@
 name: CompatHelper
 on:
  schedule:
- - cron: '0 0 * * *' # Everyday at midnight
+ - cron: 0 0 * * *
  workflow_dispatch:
+permissions:
+ contents: write
+ pull-requests: write
 jobs:
  CompatHelper:
  runs-on: ubuntu-latest
- permissions:
- contents: write
  steps:
- - name: Pkg.add("CompatHelper")
- run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- - name: CompatHelper.main()
+ - name: Check if Julia is already available in the PATH
+ id: julia_in_path
+ run: which julia
+ continue-on-error: true
+ - name: Install Julia, but only if it is not already available in the PATH
+ uses: julia-actions/setup-julia@v2
+ with:
+ version: '1'
+ arch: ${{ runner.arch }}
+ if: steps.julia_in_path.outcome != 'success'
+ - name: "Add the General registry via Git"
+ run: |
+ import Pkg
+ ENV["JULIA_PKG_SERVER"] = ""
+ Pkg.Registry.add("General")
+ shell: julia --color=yes {0}
+ - name: "Install CompatHelper"
+ run: |
+ import Pkg
+ name = "CompatHelper"
+ uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
+ version = "3"
+ Pkg.add(; name, uuid, version)
+ shell: julia --color=yes {0}
+ - name: "Run CompatHelper"
+ run: |
+ import CompatHelper
+ CompatHelper.main(subdirs=["", "MakieCore", "GLMakie", "WGLMakie", "CairoMakie", "RPRMakie"])
+ shell: julia --color=yes {0}
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
- run: julia -e 'using CompatHelper; CompatHelper.main()'
+  # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

.github/workflows/Docs.yml

@@ -1,16 +1,16 @@
 name: Docs build and deploy
 on:
- push:
+ pull_request:
  branches:
- - main
  - master
- - breaking-release
- tags: '*'
- pull_request:
+ - breaking-0.21
+ push:
+ tags:
+ - '*'
  branches:
- - main
  - master
- - breaking-release
+ - breaking-0.21
+ workflow_dispatch:
 
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -21,12 +21,12 @@ jobs:
  runs-on: ubuntu-20.04
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  persist-credentials: false
  # NOTE: Python is necessary for the pre-rendering (minification) step
  - name: Install python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '3.8'
  - name: Install binary dependencies
@@ -35,9 +35,10 @@ jobs:
  # packages such as PyPlot.
  # - run: pip install matplotlib
  - name: Install Julia
- uses: julia-actions/setup-julia@v1
+ uses: julia-actions/setup-julia@v2
  with:
  version: '1'
+ - uses: julia-actions/cache@v2
  - name: Build and deploy docs
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -46,7 +47,7 @@ jobs:
  DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24'
  julia --color=yes makedocs.jl
  - name: Upload site as artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: Docs build
  path: ./docs/__site

.github/workflows/ci.yml

@@ -1,56 +1,54 @@
-name: Makie CI
+name: Makie.jl
 on:
  pull_request:
  paths-ignore:
  - 'docs/**'
  - '*.md'
  branches:
  - master
- - breaking-release
  push:
- paths-ignore:
- - 'docs/**'
- - '*.md'
+ tags:
+ - '*'
  branches:
  - master
- - breaking-release
- tags: '*'
 
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
 
 jobs:
- test:
+ makie:
  name: Julia ${{ matrix.version }}
  runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
  matrix:
  version:
  - '1.6'
- - '1' # automatically expands to the latest stable 1.x release of Julia
+ - '1'
  os:
  - ubuntu-20.04
  arch:
  - x64
  steps:
  - name: Checkout
- uses: actions/checkout@v3
- - uses: julia-actions/setup-julia@v1
+ uses: actions/checkout@v4
+ - uses: julia-actions/setup-julia@v2
  with:
  version: ${{ matrix.version }}
  arch: ${{ matrix.arch }}
- - uses: julia-actions/cache@v1
- - name: Install Julia dependencies
+ - uses: julia-actions/cache@v2
+ - name: Develop and test Makie
  shell: julia --project=monorepo {0}
  run: |
- using Pkg;
+ using Pkg
  # dev mono repo versions
+ pkg"registry up"
+ Pkg.update()
  pkg"dev . ./MakieCore"
  Pkg.test("Makie"; coverage=true)
 
  - uses: julia-actions/julia-processcoverage@v1
- - uses: codecov/codecov-action@v3
+ - uses: codecov/codecov-action@v4
  with:
  file: lcov.info

.github/workflows/compilation-benchmark.yaml

@@ -6,7 +6,10 @@ on:
  - '*.md'
  branches:
  - master
- - breaking-release
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
 jobs:
  benchmark:
  name: ${{ matrix.package }}
@@ -20,18 +23,23 @@ jobs:
  - WGLMakie
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Install xvfb
  run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
- - uses: julia-actions/setup-julia@v1
+ - uses: julia-actions/setup-julia@v2
  with:
  version: '1'
  arch: x64
- - uses: julia-actions/cache@v1
+ - uses: julia-actions/cache@v2
  - name: Benchmark
  continue-on-error: true
  env:
  GITHUB_TOKEN: ${{ secrets.BENCHMARK_KEY }}
  PR_NUMBER: ${{ github.event.number }}
  run: >
- DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=./metrics/ttfp/ ./metrics/ttfp/run-benchmark.jl ${{ matrix.package }} 7 ${{ github.event.pull_request.base.ref }}
+ DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=./metrics/ttfp/ ./metrics/ttfp/run-benchmark.jl ${{ matrix.package }} 20 ${{ github.event.pull_request.base.ref }}
+ - name: Upload measurements as artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: ${{ matrix.package }}
+ path: ./json

.github/workflows/enforce_news.yml

@@ -0,0 +1,14 @@
+name: "Enforce changelog"
+on:
+ pull_request:
+ types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
+
+jobs:
+ changelog:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: dangoslen/changelog-enforcer@v3
+ with:
+ changeLogPath: 'CHANGELOG.md'
+ skipLabels: 'skip-changelog'