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

Skip to content

Commit b7fdc9b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 19bb0c7 + 2f32fd8 commit b7fdc9b

123 files changed

Lines changed: 1966 additions & 1576 deletions

File tree

Some content is hidden

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

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ environment:
1616
global:
1717
PYTHONIOENCODING: UTF-8
1818
PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
19-
--cov-report= --cov=lib -m "not network" --log-level=DEBUG
19+
--cov-report= --cov=lib --log-level=DEBUG
2020

2121
matrix:
2222
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,

.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ per-file-ignores =
145145
examples/lines_bars_and_markers/span_regions.py: E402
146146
examples/lines_bars_and_markers/stem_plot.py: E402
147147
examples/lines_bars_and_markers/step_demo.py: E402
148+
examples/lines_bars_and_markers/timeline.py: E402
148149
examples/misc/agg_buffer.py: E402
149150
examples/misc/anchored_artists.py: E501
150151
examples/misc/contour_manual.py: E501

INSTALL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Third-party distributions of Matplotlib
6464
Scientific Python Distributions
6565
-------------------------------
6666

67-
`Anaconda <https://www.continuum.io/downloads/>`_ and `Canopy
67+
`Anaconda <https://www.anaconda.com/>`_ and `Canopy
6868
<https://www.enthought.com/products/canopy/>`_ and `ActiveState
6969
<https://www.activestate.com/activepython/downloads>`_ are excellent
7070
choices that "just work" out of the box for Windows, macOS and common

doc/_templates/layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h3>{{ _('Navigation') }}</h3>
4141
<li><a href="{{ pathto('gallery/index') }}">examples</a>|&nbsp;</li>
4242
<li><a href="{{ pathto('tutorials/index') }}">tutorials</a>|&nbsp;</li>
4343
<li><a href="{{ pathto('api/api_overview') }}">API</a>|&nbsp;</li>
44-
<li><a href="{{ pathto('contents') }}">docs</a> &raquo;</li>
44+
<li><a href="{{ pathto('contents') }}">contents</a> &raquo;</li>
4545

4646
{%- for parent in parents %}
4747
<li><a href="{{ parent.link|e }}" {% if loop.last %}{{

0 commit comments

Comments
 (0)