Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 93618e8

Browse files
sauerburgersauerburger
committed
Merge branch 'main' into ttc-font-support
2 parents 2219c1a + 0f6a627 commit 93618e8

40 files changed

+745
-355
lines changed

‎.github/workflows/tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ jobs:
4848
XVFB_RUN: xvfb-run -a
4949
- os: ubuntu-20.04
5050
python-version: '3.10'
51-
# Re-add this when extra dependencies have wheels.
52-
# extra-requirements: '-r requirements/testing/extra.txt'
51+
extra-requirements: '-r requirements/testing/extra.txt'
5352
XVFB_RUN: xvfb-run -a
5453
- os: macos-latest
5554
python-version: 3.8

‎.pre-commit-config.yaml

Lines changed: 3 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: ["--django"]
2325
- id: trailing-whitespace
2426
exclude_types: [svg]
2527
- repo: https://github.com/pycqa/flake8

‎doc/_static/mpl.css

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -12,144 +12,10 @@ a:hover {
1212
color: #CA7900;
1313
}
1414

15-
table.highlighttable {
16-
margin-left: 0.5em;
17-
}
18-
19-
table.highlighttable td {
20-
padding: 0 0.5em 0 0.5em;
21-
}
22-
2315
.simple li>p {
2416
margin: 0;
2517
}
2618

27-
div.responsive_screenshots {
28-
/* Horizontally centered */
29-
display: block;
30-
margin: auto;
31-
32-
/* Do not go beyond 1:1 scale (and ensure a 1x4 tight layout) */
33-
max-width: 640px; /* at most 4 x 1:1 subfig width */
34-
max-height: 120px; /* at most 1 x 1:1 subfig height */
35-
}
36-
37-
/* To avoid subfigure parts outside of the responsive_screenshots */
38-
/* element (see <https://stackoverflow.com/q/2062258/>) */
39-
span.clear_screenshots { clear: left; display: block; }
40-
41-
div.responsive_subfig{
42-
float: left;
43-
width: 25%; /* we want 4 subfigs in a row */
44-
45-
/* Include content, padding and border in width. This should */
46-
/* avoid having to use tricks like "width: 24.9999%" */
47-
box-sizing: border-box;
48-
}
49-
50-
div.responsive_subfig img {
51-
/* Horizontally centered */
52-
display: block;
53-
margin: auto;
54-
55-
/* Possible downscaling */
56-
max-width: 162px; /* at most 1 x 1:1 subfig width */
57-
max-height: 139px; /* at most 1 x 1:1 subfig height */
58-
59-
width: 100%;
60-
}
61-
62-
@media only screen and (max-width: 930px){
63-
/* The value of 1000px was handcrafted to provide a more or less */
64-
/* smooth transition between the 1x4 and the 2x2 layouts. It is */
65-
/* NB: it is slightly below 1024px: so one should still have a */
66-
/* row in a 1024x768 window */
67-
68-
div.responsive_screenshots {
69-
/* Do not go beyond 1:1 scale (and ensure a 2x2 tight layout) */
70-
max-width: 324px; /* at most 2 x 1:1 subfig width */
71-
max-height: 278px; /* at most 2 x 1:1 subfig height */
72-
}
73-
74-
div.responsive_subfig {
75-
width: 50%; /* we want 2 subfigs in a row */
76-
}
77-
}
78-
79-
/* bullet boxes on main page */
80-
div.bullet-box-container {
81-
display: flex;
82-
flex-wrap: wrap;
83-
margin: 1em 0;
84-
}
85-
86-
div.bullet-box {
87-
flex-grow: 1;
88-
width: 28%;
89-
margin: 0.4em;
90-
padding: 0 1em;
91-
background: #eff9ff;
92-
}
93-
94-
div.bullet-box p:first-of-type {
95-
font-size: 1.4em;
96-
text-align: center;
97-
}
98-
99-
div.bullet-box ul {
100-
padding-left: 1.2em;
101-
}
102-
103-
div.bullet-box li {
104-
padding-left: 0.3em;
105-
margin-bottom: 0.3em;
106-
}
107-
108-
@media only screen and (max-width: 930px){
109-
div.bullet-box {
110-
flex: 0 0 90%;
111-
}
112-
}
113-
114-
/* community items on main page */
115-
div.box {
116-
display: flex;
117-
flex-flow: row wrap;
118-
}
119-
120-
div.box-item {
121-
flex: 0 0 45%;
122-
padding: 4px;
123-
margin: 8px 12px;
124-
}
125-
126-
div.box-item img {
127-
float: left;
128-
width: 30px;
129-
height: 30px;
130-
fill: #888;
131-
132-
}
133-
div.box-item p {
134-
margin: 0 0 0 50px;
135-
}
136-
137-
div.box-item ul {
138-
margin: 0 0 0 50px;
139-
padding-left: 20px;
140-
}
141-
142-
hr.box-sep {
143-
margin: 1em 2em;
144-
}
145-
146-
@media only screen and (max-width: 930px){
147-
div.box-item {
148-
flex: 0 0 90%;
149-
}
150-
}
151-
152-
15319
/* multi column TOC */
15420
.contents ul {
15521
list-style-type: none;

‎doc/api/next_api_changes/deprecations/23014-OG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Methods to set parameters in ``LogLocator`` and ``LogFormatter*``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
In `~.LogFormatter` and derived subclasses, the methods ``base`` and
5+
``label_minor`` for setting the respective parameter are deprecated and
6+
replaced by ``set_base`` and ``set_label_minor``, respectively.
7+
8+
In `~.LogLocator`, the methods ``base`` and ``subs`` for setting the
9+
respective parameter are deprecated. Instead, use
10+
``set_params(base=..., subs=...)``.

‎doc/api/next_api_changes/deprecations/23166-ES.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
``Legend`` constructor
2-
~~~~~~~~~~~~~~~~~~~~~~
1+
Positional arguments in Artist constructors
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33

4-
All arguments to `.legend.Legend` other than *parent*, *handles*, and *labels*
5-
will become keyword-only in a future version.
4+
Passing all but the very few first arguments positionally in the constructors
5+
of Artists is deprecated. Most arguments will become keyword-only in a future
6+
version.

‎doc/api/next_api_changes/deprecations/23190-OG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Unused methods in ``Axis``, ``Tick``, ``XAxis``, and ``YAxis``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
The following methods are no longer used and deprecated without a replacement::
5+
6+
- ``Axis.get_ticklabel_extents``
7+
- ``Tick.get_pad_pixels``
8+
- ``XAxis.get_text_heights``
9+
- ``YAxis.get_text_widths``

‎doc/api/next_api_changes/deprecations/23232-TH.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Passing *linefmt* positionally is undeprecated
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
Positional use of all formatting parameters in `~.Axes.stem` has been
5+
deprecated since Matplotlib 3.5. This deprecation is relaxed so that one can
6+
still pass *linefmt* positionally, i.e. ``stem(x, y, 'r')``.

‎doc/api/next_api_changes/deprecations/23289-AL.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
``backend_pdf.Name.hexify``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
... is deprecated with no replacement.

‎doc/conf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,6 @@ def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
559559

560560
numpydoc_show_class_members = False
561561

562-
html4_writer = True
563-
564562
inheritance_node_attrs = dict(fontsize=16)
565563

566564
graphviz_dot = shutil.which('dot')

‎examples/pyplots/fig_axes_customize_simple.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
for line in ax1.yaxis.get_ticklines():
3030
# line is a Line2D instance
31-
line.set_color('tab:green')
31+
line.set_markeredgecolor('tab:green')
3232
line.set_markersize(25)
3333
line.set_markeredgewidth(3)
3434

@@ -47,7 +47,7 @@
4747
# - `matplotlib.text.Text.set_fontsize`
4848
# - `matplotlib.text.Text.set_color`
4949
# - `matplotlib.lines.Line2D`
50-
# - `matplotlib.lines.Line2D.set_color`
50+
# - `matplotlib.lines.Line2D.set_markeredgecolor`
5151
# - `matplotlib.lines.Line2D.set_markersize`
5252
# - `matplotlib.lines.Line2D.set_markeredgewidth`
5353
# - `matplotlib.patches.Patch.set_facecolor`

‎examples/scales/log_test.py renamed to ‎examples/scales/semilogx_demo.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
Log Axis
44
========
55
6+
.. redirect-from:: /gallery/scales/log_test
7+
68
This is an example of assigning a log-scale for the x-axis using
79
`~.axes.Axes.semilogx`.
810
"""

0 commit comments

Comments
 (0)