8000 Merge branch 'matplotlib:main' into fix_QuadMesh_cursor_data · matplotlib/matplotlib@ec7e6ac · GitHub
[go: up one dir, main page]
Skip to content

Commit ec7e6ac

Browse files
raphaelquastraphaelquast
authored
Merge branch 'matplotlib:main' into fix_QuadMesh_cursor_data
2 parents d522504 + 925b27f commit ec7e6ac

File tree

342 files changed

+7056
-4680
lines changed
  • setup.py
  • setupext.py
  • src
  • tox.ini
  • tutorials

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    342 files changed

    +7056
    -4680
    lines changed

    ‎.appveyor.yml

    Lines changed: 4 additions & 7 deletions
    Original file line numberDiff line numberDiff line change
    @@ -21,15 +21,12 @@ environment:
    2121
    PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
    2222

    2323
    matrix:
    24-
    # In theory we could use a single CONDA_INSTALL_LOCN because we construct
    25-
    # the envs anyway. But using one for the right python version hopefully
    26-
    # making things faster due to package caching.
    27-
    - PYTHON_VERSION: "3.7"
    28-
    CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
    24+
    - PYTHON_VERSION: "3.8"
    25+
    CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
    2926
    TEST_ALL: "no"
    3027
    EXTRAREQS: "-r requirements/testing/extra.txt"
    31-
    - PYTHON_VERSION: "3.8"
    32-
    CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
    28+
    - PYTHON_VERSION: "3.9"
    29+
    CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
    3330
    TEST_ALL: "no"
    3431
    EXTRAREQS: "-r requirements/testing/extra.txt"
    3532

    ‎.flake8

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -42,7 +42,6 @@ exclude =
    4242

    4343
    per-file-ignores =
    4444
    setup.py: E402
    45-
    setupext.py: E501
    4645
    tests.py: F401
    4746

    4847
    lib/matplotlib/__init__.py: E402, F401

    ‎.git-blame-ignore-revs

    Lines changed: 8 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,8 @@
    1+
    # style: end-of-file-fixer pre-commit hook
    2+
    c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
    3+
    4+
    # style: trailing-whitespace pre-commit hook
    5+
    213061c0804530d04bbbd5c259f10dc8504e5b2b
    6+
    7+
    # style: check-docstring-first pre-commit hook
    8+
    046533797725293dfc2a6edb9f536b25f08aa636

    ‎.github/ISSUE_TEMPLATE/bug_report.yml

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,16 +6,16 @@ body:
    66
    id: summary
    77
    attributes:
    88
    label: Bug summary
    9-
    description: Describe the bug in 1-2 short sentences
    10-
    placeholder:
    9+
    description: Describe the bug in 1-2 short sentences
    10+
    placeholder:
    1111
    value:
    1212
    validations:
    1313
    required: true
    1414
    - type: textarea
    1515
    id: reproduction
    1616
    attributes:
    1717
    label: Code for reproduction
    18-
    description: If possible, please provide a minimum self-contained example.
    18+
    description: If possible, please provide a minimum self-contained example.
    1919
    placeholder: Paste your code here
    2020
    render: python
    2121
    validations:
    @@ -59,7 +59,7 @@ body:
    5959
    required: true
    6060
    - type: input
    6161
    id: matplotlib-backend
    62-
    attributes:
    62+
    attributes:
    6363
    label: Matplotlib Backend
    6464
    description: "From Python prompt: `import matplotlib; print(matplotlib.get_backend())`"
    6565
    - type: input

    ‎.github/ISSUE_TEMPLATE/documentation.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -15,7 +15,7 @@ body:
    1515
    id: problem
    1616
    attributes:
    1717
    label: Problem
    18-
    description: What is missing, unclear, or wrong in the documentation?
    18+
    description: What is missing, unclear, or wrong in the documentation?
    1919
    placeholder: |
    2020
    * I found [...] to be unclear because [...]
    2121
    * [...] made me think that [...] when really it should be [...]

    ‎.github/ISSUE_TEMPLATE/maintenance.yml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,11 +7,11 @@ body:
    77
    id: summary
    88
    attributes:
    99
    label: Summary
    10-
    description: Please provide 1-2 short sentences that succinctly describes what could be improved.
    10+
    description: Please provide 1-2 short sentences that succinctly describes what could be improved.
    1111
    validations:
    1212
    required: true
    1313
    - type: textarea
    1414
    id: fix
    1515
    attributes:
    1616
    label: Proposed fix
    17-
    description: Please describe how you think this could be improved.
    17+
    description: Please describe how you think this could be improved.

    ‎.github/workflows/cibuildwheel.yml

    Lines changed: 21 additions & 36 deletions
    Original file line numberDiff line numberDiff line change
    @@ -20,17 +20,19 @@ on:
    2020
    jobs:
    2121
    build_wheels:
    2222
    if: |
    23-
    (
    24-
    github.event.action == 'labeled' &&
    25-
    github.event.label.name == 'Run cibuildwheel'
    26-
    ) ||
    27-
    contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
    23+
    github.event_name == 'push' ||
    24+
    github.event_name == 'pull_request' && (
    25+
    (
    26+
    github.event.action == 'labeled' &&
    27+
    github.event.label.name == 'Run cibuildwheel'
    28+
    ) ||
    29+
    contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
    30+
    )
    2831
    name: Build wheels on ${{ matrix.os }}
    2932
    runs-on: ${{ matrix.os }}
    3033
    env:
    31-
    min-numpy-version: "1.17.3"
    32-
    min-numpy-hash: "b6/d6/be8f975f5322336f62371c9abeb936d592c98c047ad63035f1b38ae08efe"
    3334
    CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
    35+
    MACOSX_DEPLOYMENT_TARGET: "10.12"
    3436
    strategy:
    3537
    matrix:
    3638
    os: [ubuntu-18.04, windows-latest, macos-10.15]
    @@ -46,44 +48,27 @@ jobs:
    4648
    with:
    4749
    platforms: arm64
    4850

    49-
    - uses: actions/checkout@v2
    51+
    - uses: actions/checkout@v3
    5052
    with:
    5153
    fetch-depth: 0
    5254

    53-
    - uses: actions/setup-python@v2
    55+
    - uses: actions/setup-python@v3
    5456
    name: Install Python
    5557
    with:
    56-
    python-version: '3.7'
    57-
    58-
    - uses: actions/cache@v2
    59-
    id: numpy-cache
    60-
    with:
    61-
    path: numpy-aarch64-cache/
    62-
    key: numpy-${{ matrix.cibw_archs }}-cache-${{ env.min-numpy-version }}
    58+
    python-version: '3.8'
    6359

    6460
    - name: Install cibuildwheel
    6561
    run: |
    6662
    python -m pip install cibuildwheel==2.1.1
    6763
    68-
    - name: Build minimum NumPy for aarch64
    69-
    if: matrix.cibw_archs == 'aarch64' && steps.numpy-cache.outputs.cache-hit != 'true'
    70-
    run: |
    71-
    wget https://files.pythonhosted.org/packages/${{ env.min-numpy-hash }}/numpy-${{ env.min-numpy-version }}.zip
    72-
    unzip numpy-${{ env.min-numpy-version }}.zip
    73-
    cd numpy-${{ env.min-numpy-version }}
    74-
    python -m cibuildwheel --output-dir ../numpy-aarch64-cache
    75-
    env:
    76-
    CIBW_BUILD: "cp37-* cp38-*"
    77-
    CIBW_ARCHS: aarch64
    78-
    7964
    - name: Build wheels for CPython 3.10
    8065
    run: |
    8166
    python -m cibuildwheel --output-dir dist
    8267
    env:
    8368
    CIBW_BUILD: "cp310-*"
    8469
    CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
    8570
    CIBW_MANYLINUX_I686_IMAGE: manylinux2014
    86-
    CIBW_BEFORE_BUILD: pip install certifi numpy==1.21.3
    71+
    CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
    8772
    MPL_DISABLE_FH4: "yes"
    8873
    CIBW_ARCHS: ${{ matrix.cibw_archs }}
    8974

    @@ -94,36 +79,36 @@ jobs:
    9479
    CIBW_BUILD: "cp39-*"
    9580
    CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
    9681
    CIBW_MANYLINUX_I686_IMAGE: manylinux1
    97-
    CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.3
    82+
    CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
    9883
    MPL_DISABLE_FH4: "yes"
    9984
    CIBW_ARCHS: ${{ matrix.cibw_archs }}
    10085

    101-
    - name: Build wheels for CPython
    86+
    - name: Build wheels for CPython 3.8
    10287
    run: |
    10388
    python -m cibuildwheel --output-dir dist
    10489
    env:
    105-
    CIBW_BUILD: "cp37-* cp38-*"
    90+
    CIBW_BUILD: "cp38-*"
    10691
    CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
    10792
    CIBW_MANYLINUX_I686_IMAGE: manylinux1
    108-
    CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
    93+
    CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.2
    10994
    MPL_DISABLE_FH4: "yes"
    11095
    CIBW_ARCHS: ${{ matrix.cibw_archs }}
    11196

    11297
    - name: Build wheels for PyPy
    11398
    run: |
    11499
    python -m cibuildwheel --output-dir dist
    115100
    env:
    116-
    CIBW_BUILD: "pp37-*"
    117-
    CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
    101+
    CIBW_BUILD: "pp38-*"
    102+
    CIBW_BEFORE_BUILD: pip install certifi oldest-supported-numpy
    118103
    CIBW_ARCHS: ${{ matrix.cibw_archs }}
    119104
    PIP_USE_FEATURE: in-tree-build
    120-
    if: matrix.cibw_archs != 'aarch64'
    105+
    if: false && matrix.cibw_archs != 'aarch64'
    121106

    122107
    - name: Validate that LICENSE files are included in wheels
    123108
    run: |
    124109
    python ./ci/check_wheel_licenses.py
    125110
    126-
    - uses: actions/upload-artifact@v2
    111+
    - uses: actions/upload-artifact@v3
    127112
    with:
    128113
    name: wheels
    129114
    path: ./dist/*.whl

    ‎.github/workflows/clean_pr.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@ jobs:
    66
    runs-on: ubuntu-latest
    77

    88
    steps:
    9-
    - uses: actions/checkout@v2
    9+
    - uses: actions/checkout@v3
    1010
    with:
    1111
    fetch-depth: '0'
    1212
    - name: Check for added-and-deleted files

    ‎.github/workflows/nightlies.yml

    Lines changed: 65 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,65 @@
    1+
    name: Upload nightly wheels to Anaconda Cloud
    2+
    3+
    on:
    4+
    # Run daily at 1:23 UTC to upload nightly wheels to Anaconda Cloud
    5+
    schedule:
    6+
    - cron: '23 1 * * *'
    7+
    # Run on demand with workflow dispatch
    8+
    workflow_dispatch:
    9+
    10+
    jobs:
    11+
    upload_nightly_wheels:
    12+
    name: Upload nightly wheels to Anaconda Cloud
    13+
    runs-on: ubuntu-latest
    14+
    if: github.repository_owner == 'matplotlib'
    15+
    16+
    steps:
    17+
    - name: Install Python
    18+
    uses: actions/setup-python@v3
    19+
    with:
    20+
    python-version: '3.x'
    21+
    22+
    # c.f. https://github.com/actions/download-artifact/issues/3#issuecomment-1017141067
    23+
    - name: Download wheel artifacts from last build on 'main'
    24+
    shell: bash
    25+
    env:
    26+
    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    27+
    run: |
    28+
    PROJECT_REPO="matplotlib/matplotlib"
    29+
    BRANCH="main"
    30+
    WORKFLOW_NAME="cibuildwheel.yml"
    31+
    ARTIFACT_NAME="wheels"
    32+
    33+
    gh run --repo "${PROJECT_REPO}" \
    34+
    list --branch "${BRANCH}" \
    35+
    --workflow "${WORKFLOW_NAME}" \
    36+
    --json event,status,databaseId > runs.json
    37+
    # Filter on 'push' events to main (merged PRs) that have completed
    38+
    jq --compact-output \
    39+
    '[ .[] | select(.event == "push") | select(.status == "completed") ]' \
    40+
    runs.json > pushes.json
    41+
    # Get id of latest build of wheels
    42+
    RUN_ID=$(
    43+
    jq --compact-output \
    44+
    'sort_by(.databaseId) | reverse | .[0].databaseId' pushes.json
    45+
    )
    46+
    gh run --repo "${PROJECT_REPO}" \
    47+
    download "${RUN_ID}" --name "${ARTIFACT_NAME}"
    48+
    49+
    mkdir dist
    50+
    mv *.whl dist/
    51+
    ls -l dist/
    52+
    53+
    - name: Install anaconda-client
    54+
    run: |
    55+
    python -m pip install --upgrade pip setuptools wheel
    56+
    # c.f. https://github.com/Anaconda-Platform/anaconda-client/issues/540
    57+
    python -m pip install git+https://github.com/Anaconda-Server/anaconda-client@be1e14936a8e947da94d026c990715f0596d7043
    58+
    python -m pip list
    59+
    60+
    - name: Upload wheels to Anaconda Cloud as nightlies
    61+
    run: |
    62+
    anaconda --token ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} upload \
    63+
    --user scipy-wheels-nightly \
    64+
    --skip-existing \
    65+
    dist/matplotlib-*.whl

    ‎.github/workflows/reviewdog.yml

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,10 +6,10 @@ jobs:
    66
    name: flake8
    77
    runs-on: ubuntu-latest
    88
    steps:
    9-
    - uses: actions/checkout@v2
    9+
    - uses: actions/checkout@v3
    1010

    1111
    - name: Set up Python 3
    12-
    uses: actions/setup-python@v1
    12+
    uses: actions/setup-python@v3
    1313
    with:
    1414
    python-version: 3.8
    1515

    @@ -37,7 +37,7 @@ jobs:
    3737
    name: eslint
    3838
    runs-on: ubuntu-latest
    3939
    steps:
    40-
    - uses: actions/checkout@v2
    40+
    - uses: actions/checkout@v3
    4141

    4242
    - name: eslint
    4343
    uses: reviewdog/action-eslint@v1

    0 commit comments

    Comments
     (0)
    0