8000 Merge branch 'main' into timedelta-handling-v2 · matplotlib/matplotlib@6dd0aa2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6dd0aa2

Browse files
theOehrlytheOehrly
committed
Merge branch 'main' into timedelta-handling-v2
2 parents b990492 + 0758a12 commit 6dd0aa2

File tree

337 files changed

+10006
-7847
lines changed

Some content is hidden

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

337 files changed

+10006
-7847
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ install:
5555
- conda create -q -n test-environment python=%PYTHON_VERSION% tk "pip<22.0"
5656
- activate test-environment
5757
# pull pywin32 from conda because on py38 there is something wrong with finding
58-
# the dlls when insalled from pip
58+
# the dlls when installed from pip
5959
- conda install -c conda-forge pywin32
6060
# install pyqt from conda-forge
6161
- conda install -c conda-forge pyqt

‎.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ commands:
9696
- run:
9797
name: Install Python dependencies
9898
command: |
99+
python -m pip install --no-deps --user \
100+
git+https://github.com/matplotlib/mpl-sphinx-theme.git
99101
python -m pip install --user \
100102
numpy<< parameters.numpy_version >> codecov coverage \
101103
-r requirements/doc/doc-requirements.txt

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
66

77
# style: check-docstring-first pre-commit hook
88
046533797725293dfc2a6edb9f536b25f08aa636
9+
10+
# chore: fix spelling errors
11+
686c9e5a413e31c46bb049407d5eca285bcab76d

‎.github/workflows/cibuildwheel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ jobs:
4444
steps:
4545
- name: Set up QEMU
4646
if: matrix.cibw_archs == 'aarch64'
47-
uses: docker/setup-qemu-action@v1
47+
uses: docker/setup-qemu-action@v2
4848
with:
4949
platforms: arm64
5050

5151
- uses: actions/checkout@v3
5252
with:
5353
fetch-depth: 0
5454

55-
- uses: actions/setup-python@v3
55+
- uses: actions/setup-python@v4
5656
name: Install Python
5757
with:
5858
python-version: '3.8'

‎.github/workflows/nightlies.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Install Python
18-
uses: actions/setup-python@v3
18+
uses: actions/setup-python@v4
1919
with:
2020
python-version: '3.x'
2121

@@ -63,3 +63,23 @@ jobs:
6363
--user scipy-wheels-nightly \
6464
--skip-existing \
6565
dist/matplotlib-*.whl
66+
67+
- name: Remove old uploads to save space
68+
shell: bash
69+
run: |
70+
N_LATEST_UPLOADS=5
71+
72+
# Remove all _but_ the last "${N_LATEST_UPLOADS}" package versions
73+
# N.B.: `anaconda show` places the newest packages at the bottom of the output
74+
# of the 'Versions' section and package versions are preceded with a ' + '.
75+
anaconda show scipy-wheels-nightly/matplotlib &> >(grep '+') | \
76+
sed 's/.* + //' | \
77+
head --lines "-${N_LATEST_UPLOADS}" > remove-package-versions.txt
78+
79+
if [ -s remove-package-versions.txt ]; then
80+
while LANG=C IFS= read -r package_version ; do
81+
anaconda --token ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} remove \
82+
--force \
83+
"scipy-wheels-nightly/matplotlib/${package_version}"
84+
done <remove-package-versions.txt
85+
fi

‎.github/workflows/reviewdog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v3
1010

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

‎.github/workflows/tests.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,26 @@ jobs:
3636
extra-requirements: '-c requirements/testing/minver.txt'
3737
pyqt5-ver: '==5.11.2 sip==5.0.0' # oldest versions with a Py3.8 wheel.
3838
delete-font-cache: true
39-
XVFB_RUN: xvfb-run -a
4039
- os: ubuntu-18.04
4140
python-version: 3.8
4241
extra-requirements: '-r requirements/testing/extra.txt'
43-
XVFB_RUN: xvfb-run -a
4442
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
4543
- os: ubuntu-20.04
4644
python-version: 3.9
4745
extra-requirements: '-r requirements/testing/extra.txt'
48-
XVFB_RUN: xvfb-run -a
4946
- os: ubuntu-20.04
5047
python-version: '3.10'
51-
# Re-add this when extra dependencies have wheels.
52-
# extra-requirements: '-r requirements/testing/extra.txt'
53-
XVFB_RUN: xvfb-run -a
48+
extra-requirements: '-r requirements/testing/extra.txt'
5449
- os: macos-latest
5550
python-version: 3.8
56-
XVFB_RUN: ""
5751

5852
steps:
5953
- uses: actions/checkout@v3
6054
with:
6155
fetch-depth: 0
6256

6357
- name: Set up Python ${{ matrix.python-version }}
64-
uses: actions/setup-python@v3
58+
uses: actions/setup-python@v4
6559
with:
6660
python-version: ${{ matrix.python-version }}
6761

@@ -161,8 +155,8 @@ jobs:
161155
162156
# Install dependencies from PyPI.
163157
python -m pip install --upgrade $PRE \
164-
cycler fonttools kiwisolver numpy packaging pillow pyparsing \
165-
python-dateutil setuptools-scm \
158+
'contourpy>=1.0.1' cycler fonttools kiwisolver numpy packaging \
159+
pillow pyparsing python-dateutil setuptools-scm \
166160
-r requirements/testing/all.txt \
167161
${{ matrix.extra-requirements }}
168162
@@ -221,14 +215,6 @@ jobs:
221215
run: |
222216
python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple --upgrade numpy pandas
223217
224-
# Turn all warnings to errors, except ignore the distutils deprecations and the find_spec warning
225-
cat >> pytest.ini << EOF
226-
filterwarnings =
227-
error
228-
ignore:.*distutils:DeprecationWarning
229-
ignore:DynamicImporter.find_spec\(\) not found; falling back to find_module\(\):ImportWarning
230-
EOF
231-
232218
- name: Install Matplotlib
233219
run: |
234220
ccache -s
@@ -266,7 +252,7 @@ jobs:
266252

267253
- name: Run pytest
268254
run: |
269-
${{ matrix.XVFB_RUN }} python -mpytest -raR -n auto \
255+
python -mpytest -raR -n auto \
270256
--maxfail=50 --timeout=300 --durations=25 \
271257
--cov-report=xml --cov=lib --log-level=DEBUG --color=yes
272258

‎.matplotlib-repo

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The existence of this file signals that the code is a matplotlib source repo
2+
and not an installed version. We use this in __init__.py for gating version
3+
detection.

‎.pre-commit-config.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ exclude: |
1313
)
1414
repos:
1515
- repo: https://github.com/pre-commit/pre-commit-hooks
16-
rev: v4.2.0
16+
rev: v4.3.0
1717
hooks:
1818
- id: check-added-large-files
1919
- id: check-docstring-first
2020
- id: end-of-file-fixer
2121
exclude_types: [svg]
2222
- id: mixed-line-ending
23+
- id: name-tests-test
24+
args: ["--pytest-test-first"]
2325
- id: trailing-whitespace
2426
exclude_types: [svg]
2527
- repo: https://github.com/pycqa/flake8
@@ -28,3 +30,14 @@ repos:
2830
- id: flake8
2931
additional_dependencies: [pydocstyle>5.1.0, flake8-docstrings>1.4.0]
3032
args: ["--docstring-convention=all"]
33+
- repo: https://github.com/codespell-project/codespell
34+
rev: v2.1.0
35+
hooks:
36+
- id: codespell
37+
files: ^.*\.(py|c|cpp|h|m|md|rst|yml)$
38+
args: [
39+
"--ignore-words",
40+
"ci/codespell-ignore-words.txt",
41+
"--skip",
42+
"doc/users/project/credits.rst"
43+
]

‎azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
trigger:
77
branches:
88
exclude:
9-
- v[0-9]+.[0-9]+.[0-9x]+-doc
9+
- v*-doc
1010
pr:
1111
branches:
1212
exclude:
13-
- v[0-9]+.[0-9]+.[0-9x]+-doc
13+
- v*-doc
1414

1515
stages:
1616

‎ci/codespell-ignore-words.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
ans
2+
axises
3+
ba
4+
cannotation
5+
coo
6+
curvelinear
7+
flate
8+
hist
9+
inout
10+
ment
11+
nd
12+
oly
13+
sur
14+
te
15+
thisy
16+
whis
17+
wit

‎doc/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ documentation. All of the documentation is written using sphinx, a
1414
python documentation system built on top of ReST. This directory contains
1515

1616
* users - the user documentation, e.g., installation, plotting tutorials,
17-
configuration tips, faq, explaations, etc.
17+
configuration tips, faq, explanations, etc.
1818

1919
* devel - documentation for Matplotlib developers
2020

‎doc/_static/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0