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

Skip to content

Commit 1712678

Browse files
mattipmattip
committed
Merge branch 'tkagg-anim' into tkagg-cffi
2 parents 09576fa + 596345e commit 1712678

193 files changed

Lines changed: 6836 additions & 4003 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: 17 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,26 @@ branches:
1111
environment:
1212

1313
global:
14-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
15-
# /E:ON and /V:ON options are not enabled in the batch script intepreter
16-
# See: http://stackoverflow.com/a/13751649/163740
17-
CMD_IN_ENV: cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd
18-
# Workaround for https://github.com/conda/conda-build/issues/636
1914
PYTHONIOENCODING: UTF-8
2015
PYTEST_ARGS: -rawR --numprocesses=auto --timeout=300 --durations=25
2116
--cov-report= --cov=lib -m "not network"
2217

2318
matrix:
24-
# for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
2519
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2620
# one for 64bit because we construct envs anyway. But using one for the
2721
# right python version is hopefully making it fast due to package caching.
28-
- TARGET_ARCH: "x64"
29-
CONDA_PY: "27"
30-
CONDA_NPY: "18"
31-
PYTHON_VERSION: "2.7"
32-
TEST_ALL: "no"
22+
- PYTHON_VERSION: "2.7"
3323
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
34-
- TARGET_ARCH: "x64"
35-
CONDA_PY: "35"
36-
CONDA_NPY: "110"
37-
PYTHON_VERSION: "3.5"
24+
TEST_ALL: "no"
25+
- PYTHON_VERSION: "3.5"
3826
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
3927
TEST_ALL: "no"
40-
- TARGET_ARCH: "x64"
41-
CONDA_PY: "36"
42-
PYTHON_VERSION: "3.6"
43-
CONDA_NPY: "111"
28+
- PYTHON_VERSION: "3.6"
4429
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
4530
TEST_ALL: "no"
4631

4732
# We always use a 64-bit machine, but can build x86 distributions
48-
# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
33+
# with the PYTHON_ARCH variable
4934
platform:
5035
- x64
5136

@@ -62,42 +47,32 @@ init:
6247
install:
6348
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
6449
- set PYTHONUNBUFFERED=1
65-
# for obvci_appveyor_python_build_env.cmd
66-
- conda update --all --yes
67-
- conda install anaconda-client=1.6.3 --yes
68-
- conda install -c conda-forge --yes obvious-ci
6950
# for msinttypes and newer stuff
70-
- conda config --prepend channels conda-forge
71-
- conda config --set show_channel_urls yes
7251
- conda config --set always_yes true
73-
# For building conda packages
74-
- conda install --yes conda-build jinja2 anaconda-client
52+
- conda update --all
53+
- conda config --set show_channel_urls yes
54+
- conda config --prepend channels conda-forge
7555
# this is now the downloaded conda...
7656
- conda info -a
7757

78-
# Fix the appveyor build environment to work with conda build
79-
# workaround for missing vcvars64.bat in py34 64bit
80-
- copy ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64"
81-
8258
# For building, use a new environment which only includes the requirements for mpl
8359
# same things as the requirements in ci/conda_recipe/meta.yaml
8460
# if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
8561
# https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
8662
#
87-
# n.b. pandas is pinned to <0.21 due to issue 9610
8863
- conda create -q -n test-environment python=%PYTHON_VERSION%
8964
msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
90-
pip setuptools numpy mock "pandas<0.21.0" sphinx tornado
65+
pip setuptools numpy mock pandas sphinx tornado
9166
- activate test-environment
9267
- echo %PYTHON_VERSION% %TARGET_ARCH%
9368
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
94-
- pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
69+
- pip install -q "pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
9570

9671
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
9772
# https://github.com/matplotlib/matplotlib/issues/9176
9873
- python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
9974
curl -sL https://github.com/python/cpython/pull/1224.patch |
100-
patch -fsup 1 -d %CONDA_PREFIX% ) || ( set errorlevel= )
75+
patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"
10176

10277
# Let the install prefer the static builds of the libs
10378
- set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
@@ -117,7 +92,7 @@ install:
11792

11893
test_script:
11994
# Now build the thing..
120-
- '%CMD_IN_ENV% pip install -ve .'
95+
- pip install -ve .
12196
# these should show no z, png, or freetype dll...
12297
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
12398
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -135,34 +110,11 @@ test_script:
135110
# tests
136111
- echo The following args are passed to pytest %PYTEST_ARGS%
137112
- python tests.py %PYTEST_ARGS%
138-
# Generate a html for visual tests
139-
- python tools/visualize_tests.py --no-browser
140-
- pip install codecov
141-
- codecov -e PYTHON_VERSION PLATFORM
142113

143114
after_test:
144-
# After the tests were a success, build packages (wheels and conda)
145-
146-
# Build the wheel with the static libs
115+
# After the tests were a success, build wheels with the static libs
147116
# Hide the output, the copied files really clutter the build log...
148-
- '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
149-
150-
# And now the conda build after a cleanup...
151-
# cleanup build files so that they don't pollute the conda build but keep the wheel in dist...
152-
- git clean -xdfq -e dist/
153-
# cleanup the environment so that the test-environment does not leak into the conda build...
154-
- set MPLBASEDIRLIST=
155-
- set LIBRARY_LIB=
156-
- deactivate
157-
- path
158-
- where python
159-
- '%CMD_IN_ENV% conda config --get channels'
160-
- '%CMD_IN_ENV% conda build -q .\ci\conda_recipe'
161-
162-
# Move the conda package into the dist directory, to register it
163-
# as an "artifact" for Appveyor.
164-
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"
165-
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"
117+
- 'python setup.py bdist_wheel > NUL:'
166118
- dir dist\
167119
- echo finished...
168120

@@ -175,8 +127,11 @@ artifacts:
175127
type: zip
176128

177129
on_finish:
130+
- pip install codecov
131+
- codecov -e PYTHON_VERSION PLATFORM
178132

179133
on_failure:
134+
# Generate a html for visual tests
180135
- python tools/visualize_tests.py --no-browser
181136
- echo zipping images after a failure...
182137
- 7z a result_images.zip result_images\ | grep -v "Compressing"

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ mpl-run: &mpl-install
6868

6969
doc-run: &doc-build
7070
name: Build documentation
71-
command: python make.py html
71+
command: make html
7272
working_directory: doc
7373

7474
doc-bundle-run: &doc-bundle

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Please do not create the PR out of master, but out of a separate branch. -->
1010
example "Raises ValueError on Non-Numeric Input to set_xlim". Please avoid
1111
non-descriptive titles such as "Addresses issue #8576".-->
1212

13+
<!--If you are contributing fixes to docstrings, please pay attention to
14+
http://matplotlib.org/devel/documenting_mpl.html#formatting. In particular,
15+
note the difference between using single backquotes, double backquotes, and
16+
asterisks in the markup.-->
1317

1418
## PR Summary
1519

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ doc/gallery
6666
doc/tutorials
6767
doc/modules
6868
doc/pyplots/tex_demo.png
69-
doc/users/installing.rst
70-
doc/_static/depsy_badge.svg
71-
doc/_static/matplotlibrc
7269
lib/dateutil
7370
examples/*/*.pdf
7471
examples/*/*.png

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ env:
5757
matrix:
5858
include:
5959
- python: 2.7
60-
env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS='pandas<0.21.0' NOSE=nose
60+
env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS=pandas NOSE=nose
6161
- python: 3.4
6262
env: PYTHON_ARGS=-OO
6363
- python: 3.6
64-
env: DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8 PANDAS='pandas<0.21.0'
64+
env: DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8 PANDAS=pandas
6565
- python: "nightly"
6666
env: PRE=--pre
6767
- os: osx
@@ -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 \

‎INSTALL.rst‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.. The source of this document is INSTALL.rst. During the doc build process,
2-
.. this file is copied over to doc/users/installing.rst.
3-
.. Therefore, you must edit INSTALL.rst, *not* doc/users/installing.rst!
4-
51
.. _pip: https://pypi.python.org/pypi/pip/
62

73
==========
@@ -13,7 +9,6 @@ Installing
139
If you wish to contribute to the project, it's recommended you
1410
:ref:`install the latest development version<install_from_source>`.
1511

16-
1712
.. contents::
1813

1914
Installing an official release
@@ -198,7 +193,7 @@ optional Matplotlib backends and the capabilities they provide.
198193
`PySide <https://pypi.python.org/pypi/PySide>`_: for the Qt4Agg backend;
199194
* `PyQt5 <https://pypi.python.org/pypi/PyQt5>`_: for the Qt5Agg backend;
200195
* :term:`pygtk` (>= 2.4): for the GTK and the GTKAgg backend;
201-
* :term:`wxpython` (>= 2.8 or later): for the WX or WXAgg backend;
196+
* :term:`wxpython` (>= 2.9 or later): for the WX or WXAgg backend;
202197
* `pycairo <https://pypi.python.org/pypi/pycairo>`_: for GTK3Cairo;
203198
* `Tornado <https://pypi.python.org/pypi/tornado>`_: for the WebAgg backend.
204199

‎MANIFEST.in‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
include CHANGELOG INSTALL
1+
include INSTALL.rst README.rst
22
include CONTRIBUTING.md
3+
include pytest.ini
34
include Makefile MANIFEST.in
45
include matplotlibrc.template setup.cfg.template
56
include setupext.py setup.py distribute_setup.py
@@ -10,13 +11,16 @@ include lib/matplotlib/mpl-data/fonts/ttf/*
1011
include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
1112
include lib/matplotlib/mpl-data/fonts/afm/*
1213
include lib/matplotlib/mpl-data/stylelib/*
13-
recursive-include lib/matplotlib/mpl-data/sample_data *
1414
recursive-include LICENSE *
15-
recursive-include examples *
1615
recursive-include doc *
17-
recursive-include src *.cpp *.c *.h *.m
18-
recursive-include lib *
16+
recursive-include examples *
1917
recursive-include extern *
18+
recursive-include lib *
19+
recursive-include lib/matplotlib/mpl-data/sample_data *
20+
recursive-include src *.cpp *.c *.h *.m
21+
recursive-include tools *
22+
recursive-include tutorials *
23+
recursive-include unit *
2024
include versioneer.py
2125
include lib/matplotlib/_version.py
2226
include tests.py

‎ci/appveyor/vcvars64.bat‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ci/conda_recipe/README.md‎

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

‎ci/conda_recipe/bld.bat‎

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

0 commit comments

Comments
 (0)