Skip to content

Commit 82ac82f

Browse files
jklymakjklymak
committed
Merge remote-tracking branch 'upstream/master' into fixgettightbox
2 parents 28b6977 + 7cca455 commit 82ac82f

File tree

190 files changed

+5299
-5084
lines changed

Some content is hidden

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

190 files changed

+5299
-5084
lines changed

‎.appveyor.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# https://github.com/rmcgibbo/python-appveyor-conda-example
55

66
# Backslashes in quotes need to be escaped: \ -> "\\"
7+
branches:
8+
except:
9+
- /auto-backport-.*/
710

811
environment:
912

@@ -15,9 +18,6 @@ environment:
1518
# Workaround for https://github.com/conda/conda-build/issues/636
1619
PYTHONIOENCODING: UTF-8
1720
PYTEST_ARGS: -rawR --timeout=300 --durations=25 --cov-report= --cov=lib -m "not network"
18-
PYTHONHASHSEED: 0 # Workaround for pytest-xdist flaky collection order
19-
# https://github.com/pytest-dev/pytest/issues/920
20-
# https://github.com/pytest-dev/pytest/issues/1075
2121

2222
matrix:
2323
# for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
@@ -62,7 +62,9 @@ install:
6262
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
6363
- set PYTHONUNBUFFERED=1
6464
# for obvci_appveyor_python_build_env.cmd
65-
- conda install -c conda-forge --yes --quiet obvious-ci
65+
- conda update --all --yes
66+
- conda install anaconda-client=1.6.3 --yes
67+
- conda install -c conda-forge --yes obvious-ci
6668
# for msinttypes and newer stuff
6769
- conda config --prepend channels conda-forge
6870
- conda config --set show_channel_urls yes
@@ -90,6 +92,12 @@ install:
9092
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
9193
- pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
9294

95+
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
96+
# https://github.com/matplotlib/matplotlib/issues/9176
97+
- python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
98+
curl -sL https://github.com/python/cpython/pull/1224.patch |
99+
patch -fsup 1 -d %CONDA_PREFIX% ) || ( set errorlevel= )
100+
93101
# Let the install prefer the static builds of the libs
94102
- set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
95103
- mkdir lib || cmd /c "exit /b 0"

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
* text=auto
2+
*.svg binary
3+
*.svg linguist-language=true
24
lib/matplotlib/_version.py export-subst

‎CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING.md

File renamed without changes.

‎.github/ISSUE_TEMPLATE.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434

3535
**Matplotlib version**
3636
<!--Please specify your platform and versions of the relevant libraries you are using:-->
37-
* Operating System:
38-
* Matplotlib Version:
39-
* Python Version:
40-
* Jupyter Version (if applicable):
41-
* Other Libraries:
37+
* Operating system:
38+
* Matplotlib version:
39+
* Matplotlib backend (`print(matplotlib.get_backend())`):
40+
* Python version:
41+
* Jupyter version (if applicable):
42+
* Other libraries:
4243

4344
<!--Please tell us how you installed matplotlib and python e.g., from source, pip, conda-->
4445
<!--If you installed from conda, please specify which channel you used if not the default-->

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ install:
124124
echo 'PyQt5 is available' ||
125125
echo 'PyQt5 is not available'
126126
pip install -U --pre \
127-
-f https://wxpython.org/Phoenix/release-extras/linux/gtk3/ubuntu-14.04 \
127+
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 \
128128
wxPython &&
129129
python -c 'import wx' &&
130130
echo 'wxPython is available' ||

‎INSTALL.rst

+10-12
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Installing an official release
2222
Matplotlib and most of its dependencies are all available as wheel
2323
packages for macOS, Windows and Linux distributions::
2424

25-
python -m pip install -U pip
26-
python -m pip install -U matplotlib
25+
python -mpip install -U pip
26+
python -mpip install -U matplotlib
2727

2828
.. note::
2929

@@ -150,16 +150,14 @@ Python, NumPy, libpng and FreeType), you can build Matplotlib.
150150
::
151151

152152
cd matplotlib
153-
python setup.py build
154-
python setup.py install
153+
python -mpip install .
155154

156-
We provide a `setup.cfg
157-
<https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.template>`_
158-
file that goes with :file:`setup.py` which you can use to customize
159-
the build process. For example, which default backend to use, whether
160-
some of the optional libraries that Matplotlib ships with are
161-
installed, and so on. This file will be particularly useful to those
162-
packaging Matplotlib.
155+
We provide a setup.cfg_ file which you can use to customize the build
156+
process. For example, which default backend to use, whether some of the
157+
optional libraries that Matplotlib ships with are installed, and so on. This
158+
file will be particularly useful to those packaging Matplotlib.
159+
160+
.. _setup.cfg: https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.template
163161

164162
If you have installed prerequisites to nonstandard places and need to
165163
inform Matplotlib where they are, edit ``setupext.py`` and add the base
@@ -282,7 +280,7 @@ If you are using MacPorts, execute the following instead::
282280
After installing the above requirements, install Matplotlib from source by
283281
executing::
284282

285-
python setup.py install
283+
python -mpip install .
286284

287285
Note that your environment is somewhat important. Some conda users have
288286
found that, to run the tests, their PYTHONPATH must include

‎Makefile

-53
This file was deleted.

‎ci/travis/test_script.sh

-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ set -ev
1414
if [[ $DELETE_FONT_CACHE == 1 ]]; then
1515
rm -rf ~/.cache/matplotlib
1616
fi
17-
# Workaround for pytest-xdist flaky collection order
18-
# https://github.com/pytest-dev/pytest/issues/920
19-
# https://github.com/pytest-dev/pytest/issues/1075
20-
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
21-
echo PYTHONHASHSEED=$PYTHONHASHSEED
2217

2318
echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
2419
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then

0 commit comments

Comments
 (0)