Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 010af0d

Browse filesBrowse files
SocobSocob
authored
Merge branch 'matplotlib:main' into fix-pgf-fontsize
2 parents 49256f2 + 199c31f commit 010af0d
Copy full SHA for 010af0d

File tree

Expand file treeCollapse file tree

733 files changed

+25207
-11980
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

733 files changed

+25207
-11980
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+11-7Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# http://tjelvarolsson.com/blog/how-to-continuously-test-your-python-code-on-windows-using-appveyor/
33
# https://packaging.python.org/en/latest/appveyor/
44
# https://github.com/rmcgibbo/python-appveyor-conda-example
5+
---
56

67
# Backslashes in quotes need to be escaped: \ -> "\\"
78
branches:
@@ -24,7 +25,7 @@ environment:
2425
global:
2526
PYTHONFAULTHANDLER: 1
2627
PYTHONIOENCODING: UTF-8
27-
PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
28+
PYTEST_ARGS: -rfEsXR --numprocesses=auto --timeout=300 --durations=25
2829
--cov-report= --cov=lib --log-level=DEBUG
2930

3031
matrix:
@@ -38,7 +39,7 @@ environment:
3839
# We always use a 64-bit machine, but can build x86 distributions
3940
# with the PYTHON_ARCH variable
4041
platform:
41-
- x64
42+
- x64
4243

4344
# all our python builds have to happen in tests_script...
4445
build: false
@@ -70,7 +71,7 @@ install:
7071
test_script:
7172
# Now build the thing..
7273
- set LINK=/LIBPATH:%cd%\lib
73-
- pip install -ve .
74+
- pip install -v --no-build-isolation --config-settings=setup-args="--vsenv" --editable .[dev]
7475
# this should show no freetype dll...
7576
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
7677
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -79,22 +80,25 @@ test_script:
7980
- if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex
8081
# missing packages on conda-forge for imagemagick
8182
# This install sometimes failed randomly :-(
82-
#- choco install imagemagick
83+
# - choco install imagemagick
8384

8485
# Test import of tkagg backend
85-
- python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
86+
- python -c
87+
"import matplotlib as m; m.use('tkagg');
88+
import matplotlib.pyplot as plt;
89+
print(plt.get_backend())"
8690
# tests
8791
- echo The following args are passed to pytest %PYTEST_ARGS%
8892
- pytest %PYTEST_ARGS%
8993

9094
artifacts:
9195
- path: result_images\*
9296
name: result_images
93-
type: zip
97+
type: Zip
9498

9599
on_finish:
96100
- conda install codecov
97-
- codecov -e PYTHON_VERSION PLATFORM
101+
- codecov -e PYTHON_VERSION PLATFORM -n "$PYTHON_VERSION Windows"
98102

99103
on_failure:
100104
# Generate a html for visual tests

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+26-17Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Circle CI configuration file
22
# https://circleci.com/docs/
3-
3+
---
44
version: 2.1
55

66

@@ -17,7 +17,8 @@ commands:
1717
export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ")
1818
echo "Got commit message:"
1919
echo "${git_log}"
20-
if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]]); then
20+
if [[ -v CIRCLE_PULL_REQUEST ]] &&
21+
[[ $git_log =~ (\[skip circle\]|\[circle skip\]|\[skip doc\]|\[doc skip\]) ]]; then
2122
echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}."
2223
circleci-agent step halt;
2324
fi
@@ -49,12 +50,12 @@ commands:
4950
ffmpeg \
5051
fonts-crosextra-carlito \
5152
fonts-freefont-otf \
52-
fonts-humor-sans \
5353
fonts-noto-cjk \
5454
fonts-wqy-zenhei \
5555
graphviz \
5656
inkscape \
5757
lmodern \
58+
ninja-build \
5859
optipng \
5960
texlive-fonts-recommended \
6061
texlive-latex-base \
@@ -66,15 +67,20 @@ commands:
6667
fonts-install:
6768
steps:
6869
- restore_cache:
69-
key: fonts-2
70+
key: fonts-4
7071
- run:
7172
name: Install custom fonts
7273
command: |
7374
mkdir -p ~/.local/share/fonts
74-
wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
75+
wget -nc \
76+
https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true \
77+
-O ~/.local/share/fonts/Felipa-Regular.ttf || true
78+
wget -nc \
79+
https://github.com/ipython/xkcd-font/blob/master/xkcd-script/font/xkcd-script.ttf?raw=true \
80+
-O ~/.local/share/fonts/xkcd-Script.ttf || true
7581
fc-cache -f -v
7682
- save_cache:
77-
key: fonts-2
83+
key: fonts-4
7884
paths:
7985
- ~/.local/share/fonts/
8086

@@ -97,6 +103,7 @@ commands:
97103
- run:
98104
name: Install Python dependencies
99105
command: |
106+
python -m pip install --user meson-python numpy pybind11 setuptools-scm
100107
python -m pip install --user \
101108
numpy<< parameters.numpy_version >> \
102109
-r requirements/doc/doc-requirements.txt
@@ -114,15 +121,13 @@ commands:
114121
version=${version#v}
115122
python -m pip install matplotlib==${version}
116123
else
117-
python -m pip install --user -ve .
124+
python -m pip install --user --verbose \
125+
--no-build-isolation --editable .[dev]
118126
fi
119127
- save_cache:
120-
key: build-deps-1
128+
key: build-deps-2
121129
paths:
122-
# FreeType 2.6.1 tarball.
123-
- ~/.cache/matplotlib/0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
124-
# Qhull 2020.2 tarball.
125-
- ~/.cache/matplotlib/b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
130+
- subprojects/packagecache
126131

127132
doc-build:
128133
steps:
@@ -142,7 +147,7 @@ commands:
142147
export RELEASE_TAG='-t release'
143148
fi
144149
mkdir -p logs
145-
make html O="-T $RELEASE_TAG -j4 -w /tmp/sphinxerrorswarnings.log"
150+
make html O="-T $RELEASE_TAG -j1 -w /tmp/sphinxerrorswarnings.log"
146151
rm -r build/html/_sources
147152
working_directory: doc
148153
- save_cache:
@@ -199,6 +204,12 @@ commands:
199204
- store_artifacts:
200205
path: doc/build/sphinx-gallery-files.tar.gz
201206

207+
deploy-docs:
208+
steps:
209+
- run:
210+
name: "Deploy new docs"
211+
command: ./.circleci/deploy-docs.sh
212+
202213

203214
##########################################
204215
# Here is where the real jobs are defined.
@@ -218,8 +229,8 @@ jobs:
218229
- fonts-install
219230
- pip-install
220231

221-
- mpl-install
222232
- doc-deps-install
233+
- mpl-install
223234

224235
- doc-build
225236
- doc-show-errors-warnings
@@ -236,9 +247,7 @@ jobs:
236247
fingerprints:
237248
- "be:c3:c1:d8:fb:a1:0e:37:71:72:d7:a3:40:13:8f:14"
238249

239-
- deploy:
240-
name: "Deploy new docs"
241-
command: ./.circleci/deploy-docs.sh
250+
- deploy-docs
242251

243252
#########################################
244253
# Defining workflows gets us parallelism.

‎.devcontainer/devcontainer.json

Copy file name to clipboardExpand all lines: .devcontainer/devcontainer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"features": {
88
"ghcr.io/devcontainers/features/desktop-lite:1": {},
99
"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
10-
"packages": "inkscape,ffmpeg,dvipng,lmodern,cm-super,texlive-latex-base,texlive-latex-extra,texlive-fonts-recommended,texlive-latex-recommended,texlive-pictures,texlive-xetex,fonts-wqy-zenhei,graphviz,fonts-crosextra-carlito,fonts-freefont-otf,fonts-humor-sans,fonts-noto-cjk,optipng"
10+
"packages": "inkscape,ffmpeg,dvipng,lmodern,cm-super,texlive-latex-base,texlive-latex-extra,texlive-fonts-recommended,texlive-latex-recommended,texlive-pictures,texlive-xetex,fonts-wqy-zenhei,graphviz,fonts-crosextra-carlito,fonts-freefont-otf,fonts-comic-neue,fonts-noto-cjk,optipng"
1111
}
1212
},
1313
"onCreateCommand": ".devcontainer/setup.sh",

‎.flake8

Copy file name to clipboardExpand all lines: .flake8
+6-14Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ ignore =
1818
D301,
1919
D400, D401, D403, D404
2020
# ignored by pydocstyle numpy docstring convention
21-
D107, D203, D212, D213, D402, D413, D415, D416, D417,
21+
D107, D203, D212, D402, D413, D415, D416, D417,
22+
# while D213 is ignored by the numpy docstring convention, it's left out above,
23+
# because we want to enforce it.
2224

2325
exclude =
2426
.git
@@ -31,28 +33,18 @@ exclude =
3133
.eggs
3234

3335
per-file-ignores =
34-
setup.py: E402
35-
36-
lib/matplotlib/__init__.py: E402, F401
37-
lib/matplotlib/_animation_data.py: E501
38-
lib/matplotlib/_api/__init__.py: F401
39-
lib/matplotlib/_cm.py: E122, E202, E203, E302
36+
lib/matplotlib/_cm.py: E202, E203, E302
4037
lib/matplotlib/_mathtext.py: E221, E251
41-
lib/matplotlib/_mathtext_data.py: E122, E203, E261
42-
lib/matplotlib/axes/__init__.py: F401, F403
38+
lib/matplotlib/_mathtext_data.py: E203, E261
4339
lib/matplotlib/backends/backend_template.py: F401
44-
lib/matplotlib/font_manager.py: E501
45-
lib/matplotlib/image.py: F401, F403
4640
lib/matplotlib/mathtext.py: E221
4741
lib/matplotlib/pylab.py: F401, F403
48-
lib/matplotlib/pyplot.py: F401, F811
42+
lib/matplotlib/pyplot.py: F811
4943
lib/matplotlib/tests/test_mathtext.py: E501
5044
lib/matplotlib/transforms.py: E201, E202, E203
5145
lib/matplotlib/tri/_triinterpolate.py: E201, E221
5246
lib/mpl_toolkits/axes_grid1/axes_size.py: E272
53-
lib/mpl_toolkits/axisartist/__init__.py: F401
5447
lib/mpl_toolkits/axisartist/angle_helper.py: E221
55-
lib/pylab.py: F401, F403
5648

5749
doc/conf.py: E402
5850
galleries/users_explain/artists/paths.py: E402

‎.git-blame-ignore-revs

Copy file name to clipboardExpand all lines: .git-blame-ignore-revs
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
1212

1313
# chore: pyupgrade --py39-plus
1414
4d306402bb66d6d4c694d8e3e14b91054417070e
15+
16+
# style: docstring parameter indentation
17+
68daa962de5634753205cba27f21d6edff7be7a2

‎.github/CONTRIBUTING.md

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [developers guide](https://matplotlib.org/devel/index.html).
1+
Please refer to the [contributing guide](https://matplotlib.org/devel/index.html).

‎.github/FUNDING.yml

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# These are supported funding model platforms
23
github: [matplotlib, numfocus]
34
custom: https://numfocus.org/donate-to-matplotlib

‎.github/ISSUE_TEMPLATE/bug_report.yml

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/bug_report.yml
+5-6Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Bug Report
23
description: Report a bug or issue with Matplotlib.
34
title: "[Bug]: "
@@ -6,26 +7,24 @@ body:
67
id: summary
78
attributes:
89
label: Bug summary
9-
description: Describe the bug in 1-2 short sentences
10-
placeholder:
11-
value:
10+
description: Describe the bug in 1-2 short sentences
1211
validations:
1312
required: true
1413
- type: textarea
1514
id: reproduction
1615
attributes:
1716
label: Code for reproduction
18-
description: |
17+
description: >-
1918
If possible, please provide a minimum self-contained example.
2019
placeholder: Paste your code here. This field is automatically formatted as Python code.
21-
render: python
20+
render: Python
2221
validations:
2322
required: true
2423
- type: textarea
2524
id: actual
2625
attributes:
2726
label: Actual outcome
28-
description: |
27+
description: >-
2928
Paste the output produced by the code provided above, e.g.
3029
console output, images/videos produced by the code, any relevant screenshots/screencasts, etc.
3130
validations:

‎.github/ISSUE_TEMPLATE/config.yml

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/config.yml
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
2-
blank_issues_enabled: true # default
1+
# Reference:
2+
# https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
3+
---
4+
blank_issues_enabled: true # default
35
contact_links:
46
- name: Question/Support/Other
57
url: https://discourse.matplotlib.org

‎.github/ISSUE_TEMPLATE/documentation.yml

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/documentation.yml
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Documentation
23
description: Create a report to help us improve the documentation
34
title: "[Doc]: "
@@ -7,9 +8,9 @@ body:
78
id: link
89
attributes:
910
label: Documentation Link
10-
description: |
11-
Link to any documentation or examples that you are referencing.
12-
Suggested improvements should be based on the development version of the docs: https://matplotlib.org/devdocs/
11+
description: >-
12+
Link to any documentation or examples that you are referencing. Suggested improvements should be based
13+
on [the development version of the docs](https://matplotlib.org/devdocs/)
1314
placeholder: https://matplotlib.org/devdocs/...
1415
- type: textarea
1516
id: problem

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.