8000 Merge branch 'v2.1.0-doc' into v2.1.x · matplotlib/matplotlib@55830e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 55830e5

Browse files
QuLogicQuLogic
committed
Merge branch 'v2.1.0-doc' into v2.1.x
2 parents 032b374 + b8e997f commit 55830e5

11 files changed

+353
-667
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ install:
7070
- echo %PYTHON_VERSION% %TARGET_ARCH%
7171
- if %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
7272
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
73-
- pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
73+
- pip install -q "pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
7474

7575
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
7676
# https://github.com/matplotlib/matplotlib/issues/9176

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ install:
136136
137137
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
138138
pip install $PRE \
139-
pytest \
139+
pytest!=3.3.0 \
140140
pytest-cov>=2.3.1 \
141141
pytest-faulthandler \
142142
pytest-rerunfailures \

‎doc/api/axis_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ YAxis
388388
YAxis.update_units
389389
YAxis.zoom
390390

391-
``YAxis``
391+
XAxis
392392
---------
393393

394394
.. autosummary::

0 commit comments

Comments
 (0)
0