Skip to content

Commit 8226042

Browse files
raamanaraamana
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: (1723 commits) Correctly get weight & style hints from certain newer Microsoft fonts (matplotlib#12945) Remove some checks for Py<3.6 in the test suite. (matplotlib#12974) Fail-fast when trying to run tests with too-old pytest. Include scatter plots in Qt figure options editor. (matplotlib#12779) ENH: replace deprecated numpy header Minor simplifications. tickminorvisible-fix (matplotlib#12938) Remove animated=True from animation docs Update the documentation of Cursor Misc. cleanups. Add test for 3d conversion of empty PolyCollection Support ~ as nonbreaking space in mathtext. Deprecate public use of Formatter.pprint_val. MAINT: Unify calculation of normal vectors from polygons (matplotlib#12136) Fix the title of testing_api More table documentation Simplify bachelors degree example using new features. Avoid pyplot in showcase examples. Simplify argument checking in Table.__getitem__. (matplotlib#12932) Minor updates following bump to Py3.6+. ... # Conflicts: # lib/matplotlib/widgets.py
2 parents 0ef191b + 0583079 commit 8226042

1,099 files changed

Lines changed: 124127 additions & 135976 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: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,25 @@ branches:
88
except:
99
- /auto-backport-.*/
1010

11+
clone_depth: 50
12+
1113
environment:
1214

1315
global:
1416
PYTHONIOENCODING: UTF-8
15-
PYTEST_ARGS: -rawR --numprocesses=auto --timeout=300 --durations=25
17+
PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
1618
--cov-report= --cov=lib -m "not network"
1719

1820
matrix:
1921
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2022
# one for 64bit because we construct envs anyway. But using one for the
2123
# right python version is hopefully making it fast due to package caching.
22-
- PYTHON_VERSION: "3.5"
23-
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
24-
TEST_ALL: "no"
2524
- PYTHON_VERSION: "3.6"
2625
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
2726
TEST_ALL: "no"
27+
- PYTHON_VERSION: "3.7"
28+
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
29+
TEST_ALL: "no"
2830

2931
# We always use a 64-bit machine, but can build x86 distributions
3032
# with the PYTHON_ARCH variable
@@ -83,7 +85,7 @@ install:
8385
- del %LIBRARY_LIB%\z.lib
8486
- set MPLBASEDIRLIST=%CONDA_PREFIX%\Library\;.
8587
# enables the local freetype build
86-
- copy ci\travis\setup.cfg .
88+
- set MPLLOCALFREETYPE=1
8789
# Show the installed packages + versions
8890
- conda list
8991

@@ -106,7 +108,7 @@ test_script:
106108
- python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
107109
# tests
108110
- echo The following args are passed to pytest %PYTEST_ARGS%
109-
- python tests.py %PYTEST_ARGS%
111+
- pytest %PYTEST_ARGS%
110112

111113
after_test:
112114
# After the tests were a success, build wheels with the static libs

‎.circleci/config.yml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,34 @@ fonts-run: &fonts-install
4747
echo "Not downloading Humor-Sans; file already exists."
4848
fi
4949
fc-cache -f -v
50+
save_cache:
51+
key: fonts-1
52+
paths:
53+
- ~/.local/share/fonts/
54+
restore_cache:
55+
key: fonts-1
5056

5157
pip-run: &pip-install
5258
# Upgrade pip and setuptools and wheel to get as clean an install as possible
5359
name: Upgrade pip, setuptools, wheel
5460
command: |
55-
pip install --upgrade --user pip
56-
pip install --upgrade --user wheel
57-
pip install --upgrade --user setuptools
61+
python -mpip install --upgrade --user pip
62+
python -mpip install --upgrade --user wheel
63+
python -mpip install --upgrade --user setuptools
5864
5965
deps-run: &deps-install
6066
name: Install Python dependencies
6167
command: |
62-
pip install --user numpy${NUMPY_VERSION} codecov coverage
63-
pip install --user -r doc-requirements.txt
68+
python -mpip install --user numpy${NUMPY_VERSION} codecov coverage
69+
python -mpip install --user -r doc-requirements.txt
6470
6571
mpl-run: &mpl-install
6672
name: Install Matplotlib
67-
command: pip install --user -ve .
73+
command: python -mpip install --user -ve .
6874

6975
doc-run: &doc-build
7076
name: Build documentation
71-
command: make html
77+
command: make html O=-T
7278
working_directory: doc
7379

7480
doc-bundle-run: &doc-bundle
@@ -91,8 +97,10 @@ jobs:
9197
- run: *apt-install
9298
- run: *fonts-install
9399
- run: *pip-install
94-
95-
- run: *deps-install
100+
- run:
101+
<<: *deps-install
102+
environment:
103+
NUMPY_VERSION: "==1.11.0"
96104
- run: *mpl-install
97105

98106
- run: *doc-build
@@ -108,34 +116,21 @@ jobs:
108116
name: "Built documentation is available at:"
109117
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
110118

111-
- add_ssh_keys:
112-
fingerprints:
113-
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
114-
- deploy:
115-
name: "Deploy new docs"
116-
command: ./.circleci/deploy-docs.sh
117-
118-
docs-python35:
119+
docs-python37:
119120
docker:
120-
- image: circleci/python:3.5
121+
- image: circleci/python:3.7
121122
steps:
122123
- checkout
123124

124125
- run: *apt-install
125126
- run: *fonts-install
126127
- run: *pip-install
127128

128-
- run:
129-
<<: *deps-install
130-
environment:
131-
NUMPY_VERSION: "==1.10.0"
129+
- run: *deps-install
132130
- run: *mpl-install
133131

134132
- run: *doc-build
135133

136-
# We don't build the LaTeX docs here, so linkchecker will complain
137-
- run: touch doc/build/html/Matplotlib.pdf
138-
139134
- run: *doc-bundle
140135
- store_artifacts:
141136
path: doc/build/sphinx-gallery-files.tar.gz
@@ -147,6 +142,12 @@ jobs:
147142
name: "Built documentation is available at:"
148143
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
149144

145+
- add_ssh_keys:
146+
fingerprints:
147+
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
148+
- deploy:
149+
name: "Deploy new docs"
150+
command: ./.circleci/deploy-docs.sh
150151

151152
#########################################
152153
# Defining workflows gets us parallelism.
@@ -156,5 +157,5 @@ workflows:
156157
version: 2
157158
build:
158159
jobs:
159-
- docs-python35
160160
- docs-python36
161+
- docs-python37

0 commit comments

Comments
 (0)