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

Skip to content

Commit bf04d4c

Browse files
andrzejnovakandrzejnovak
committed
Merge branch 'master' into ModLine2D
2 parents b0a6244 + 37074c5 commit bf04d4c

File tree

437 files changed

+21428
-27815
lines changed

Some content is hidden

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

437 files changed

+21428
-27815
lines changed

‎.appveyor.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ environment:
2020
--cov-report= --cov=lib --log-level=DEBUG
2121

2222
matrix:
23-
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
24-
# one for 64bit because we construct envs anyway. But using one for the
25-
# right python version is hopefully making it fast due to package caching.
23+
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
24+
# the envs anyway. But using one for the right python version hopefully
25+
# making things faster due to package caching.
2626
- PYTHON_VERSION: "3.6"
2727
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
2828
TEST_ALL: "no"
@@ -48,7 +48,6 @@ init:
4848
install:
4949
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
5050
- set PYTHONUNBUFFERED=1
51-
# for msinttypes and newer stuff
5251
- conda config --set always_yes true
5352
- conda update --all
5453
- conda config --set show_channel_urls yes
@@ -58,16 +57,13 @@ install:
5857
- conda info -a
5958

6059
# For building, use a new environment which only includes the requirements for mpl
61-
# same things as the requirements in ci/conda_recipe/meta.yaml
6260
# if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
6361
# https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
64-
#
6562
- conda create -q -n test-environment python=%PYTHON_VERSION%
66-
msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
63+
freetype=2.6 tk=8.5
6764
pip setuptools numpy sphinx tornado
6865
- activate test-environment
6966
- echo %PYTHON_VERSION% %TARGET_ARCH%
70-
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
7167
- pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis36.txt
7268

7369
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
@@ -76,20 +72,16 @@ install:
7672
curl -sL https://github.com/python/cpython/pull/1224.patch |
7773
patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"
7874

79-
# enables the local freetype build
80-
- set MPLLOCALFREETYPE=1
8175
# Show the installed packages + versions
8276
- conda list
8377

8478
test_script:
8579
# Now build the thing..
8680
- set LINK=/LIBPATH:%cd%\lib
8781
- pip install -ve .
88-
# these should show no z, png, or freetype dll...
82+
# this should show no freetype dll...
8983
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
90-
- 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
91-
- 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd | findstr z.*.dll && exit /b 1 || exit /b 0'
92-
- 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd | findstr png.*.dll && exit /b 1 || exit /b 0'
84+
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
9385

9486
# this are optional dependencies so that we don't skip so many tests...
9587
- if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
@@ -104,9 +96,8 @@ test_script:
10496
- pytest %PYTEST_ARGS%
10597

10698
after_test:
107-
# After the tests were a success, build wheels with the static libs
99+
# After the tests were a success, build wheels.
108100
# Hide the output, the copied files really clutter the build log...
109-
- set MPLSTATICBUILD=True
110101
- 'python setup.py bdist_wheel > NUL:'
111102
- dir dist\
112103
- echo finished...

‎.circleci/config.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,32 @@ jobs:
145145
name: "Built documentation is available at:"
146146
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
147147

148+
docs-python38:
149+
docker:
150+
- image: circleci/python:3.8
151+
steps:
152+
- checkout
153+
154+
- run: *apt-install
155+
- run: *fonts-install
156+
- run: *pip-install
157+
158+
- run: *deps-install
159+
- run: *mpl-install
160+
161+
- run: *doc-build
162+
163+
- run: *doc-bundle
164+
- store_artifacts:
165+
path: doc/build/sphinx-gallery-files.tar.gz
166+
167+
- store_artifacts:
168+
path: doc/build/html
169+
170+
- run:
171+
name: "Built documentation is available at:"
172+
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
173+
148174
- add_ssh_keys:
149175
fingerprints:
150176
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
@@ -162,3 +188,4 @@ workflows:
162188
jobs:
163189
- docs-python36
164190
- docs-python37
191+
- docs-python38

‎.flake8

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[flake8]
2+
max-line-length = 79
23
ignore =
34
# Normal default
45
E121,E123,E126,E226,E24,E704,W503,W504,
@@ -7,7 +8,7 @@ ignore =
78
E265, E266,
89
E305, E306,
910
E722, E741,
10-
F401, F403, F811, F841,
11+
F811, F841,
1112
# Some new flake8 ignores:
1213
N801, N802, N803, N806, N812,
1314
# pydocstyle
@@ -19,6 +20,8 @@ ignore =
1920
exclude =
2021
.git
2122
build
23+
doc/gallery
24+
doc/tutorials
2225
# External files.
2326
versioneer.py
2427
tools/gh_api.py
@@ -29,20 +32,49 @@ exclude =
2932
per-file-ignores =
3033
setup.py: E402
3134
setupext.py: E501
35+
tests.py: F401
3236

3337
tools/subset.py: E221, E251, E261, E302, E501
3438

39+
lib/matplotlib/__init__.py: F401
3540
lib/matplotlib/_cm.py: E202, E203, E302
3641
lib/matplotlib/_mathtext_data.py: E203, E261
42+
lib/matplotlib/animation.py: F401
43+
lib/matplotlib/axes/__init__.py: F401, F403
44+
lib/matplotlib/axes/_axes.py: F401
45+
lib/matplotlib/backends/backend_*.py: F401
46+
lib/matplotlib/backends/qt_editor/formlayout.py: F401, F403
47+
lib/matplotlib/cbook/__init__.py: F401
48+
lib/matplotlib/figure.py: F401
3749
lib/matplotlib/font_manager.py: E221, E251, E501
50+
lib/matplotlib/image.py: F401, F403
51+
lib/matplotlib/lines.py: F401
3852
lib/matplotlib/mathtext.py: E221, E251
53+
lib/matplotlib/pylab.py: F401, F403
54+
lib/matplotlib/pyplot.py: F401
3955
lib/matplotlib/rcsetup.py: E501
56+
lib/matplotlib/style/__init__.py: F401
57+
lib/matplotlib/testing/conftest.py: F401
58+
lib/matplotlib/testing/compare.py: F401
59+
lib/matplotlib/testing/decorators.py: F401
60+
lib/matplotlib/tests/conftest.py: F401
61+
lib/matplotlib/tests/test_backend_qt.py: F401
4062
lib/matplotlib/tests/test_mathtext.py: E501
63+
lib/matplotlib/text.py: F401
4164
lib/matplotlib/transforms.py: E201, E202, E203
65+
lib/matplotlib/tri/__init__.py: F401, F403
4266
lib/matplotlib/tri/triinterpolate.py: E201, E221
43-
67+
lib/mpl_toolkits/axes_grid/*: F401, F403
68+
lib/mpl_toolkits/axes_grid1/__init__.py: F401
4469
lib/mpl_toolkits/axes_grid1/axes_size.py: E272
70+
lib/mpl_toolkits/axisartist/__init__.py: F401
4571
lib/mpl_toolkits/axisartist/angle_helper.py: E221
72+
lib/mpl_toolkits/axisartist/axes_divider.py: F401
73+
lib/mpl_toolkits/axisartist/axes_rgb.py: F401
74+
lib/mpl_toolkits/axisartist/axislines.py: F401
75+
lib/mpl_toolkits/mplot3d/__init__.py: F401
76+
lib/mpl_toolkits/tests/conftest.py: F401
77+
lib/pylab.py: F401, F403
4678

4779
doc/conf.py: E402, E501
4880
tutorials/advanced/path_tutorial.py: E402, E501
@@ -71,6 +103,7 @@ per-file-ignores =
71103

72104
examples/animation/frame_grabbing_sgskip.py: E402
73105
examples/axes_grid1/inset_locator_demo.py: E402
106+
examples/axes_grid1/scatter_hist_locatable_axes.py: E401, E402
74107
examples/axisartist/demo_curvelinear_grid.py: E402
75108
examples/color/color_by_yvalue.py: E402
76109
examples/color/color_cycle_default.py: E402
@@ -128,6 +161,7 @@ per-file-ignores =
128161
examples/lines_bars_and_markers/filled_step.py: E402
129162
examples/lines_bars_and_markers/horizontal_barchart_distribution.py: E402
130163
examples/lines_bars_and_markers/joinstyle.py: E402
164+
examples/lines_bars_and_markers/scatter_hist.py: E402
131165
examples/lines_bars_and_markers/scatter_piecharts.py: E402
132166
examples/lines_bars_and_markers/scatter_with_legend.py: E402
133167
examples/lines_bars_and_markers/span_regions.py: E402

‎.github/FUNDING.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# These are supported funding model platforms
2-
3-
custom: https://numfocus.salsalabs.org/donate-to-matplotlib/index.html
2+
github: [numfocus]
3+
custom: https://numfocus.org/donate-to-matplotlib

‎.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ matrix:
8181
- DELETE_FONT_CACHE=1
8282
- EXTRAREQS='-r requirements/testing/travis36.txt'
8383
- python: 3.7
84+
- python: 3.8
8485
- python: "nightly"
8586
env:
8687
- PRE=--pre
@@ -97,7 +98,6 @@ matrix:
9798
- $HOME/.ccache # https://github.com/travis-ci/travis-ci/issues/5853
9899
- $HOME/.cache/matplotlib
99100
allow_failures:
100-
- python: "nightly"
101101

102102
before_install: |
103103
case "$TRAVIS_OS_NAME" in
@@ -143,6 +143,10 @@ install:
143143
python -c 'import PyQt5.QtCore' &&
144144
echo 'PyQt5 is available' ||
145145
echo 'PyQt5 is not available'
146+
python -mpip install --upgrade pyside2 &&
147+
python -c 'import PySide2.QtCore' &&
148+
echo 'PySide2 is available' ||
149+
echo 'PySide2 is not available'
146150
python -mpip install --upgrade \
147151
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 \
148152
wxPython &&
@@ -156,7 +160,7 @@ install:
156160
export CPPFLAGS=--coverage
157161
fi
158162
- |
159-
MPLLOCALFREETYPE=1 python -mpip install -ve . # Install Matplotlib.
163+
python -mpip install -ve . # Install Matplotlib.
160164
- |
161165
if [[ $TRAVIS_OS_NAME != 'osx' ]] && [[ $RUN_PYTEST == 1 ]]; then
162166
unset CPPFLAGS

0 commit comments

Comments
 (0)