Skip to content

Commit 7d00946

Browse files
tacaswelltacaswell
committed
API: only support python 3.5+
Matplotlib 3.0 will not support python2.7
1 parent 79da80c commit 7d00946

File tree

5 files changed

+12
-62
lines changed

5 files changed

+12
-62
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ environment:
1919
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2020
# one for 64bit because we construct envs anyway. But using one for the
2121
# right python version is hopefully making it fast due to package caching.
22-
- PYTHON_VERSION: "2.7"
23-
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
24-
TEST_ALL: "no"
2522
- PYTHON_VERSION: "3.5"
2623
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
2724
TEST_ALL: "no"

‎.circleci/config.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ doc-bundle-run: &doc-bundle
8282
#
8383

8484
jobs:
85-
docs-python35:
85+
docs-python36:
8686
docker:
87-
- image: circleci/python:3.5
87+
- image: circleci/python:3.6
8888
steps:
8989
- checkout
9090

@@ -115,9 +115,9 @@ jobs:
115115
name: "Deploy new docs"
116116
command: ./.circleci/deploy-docs.sh
117117

118-
docs-python27:
118+
docs-python35:
119119
docker:
120-
- image: circleci/python:2.7
120+
- image: circleci/python:3.5
121121
steps:
122122
- checkout
123123

@@ -129,22 +129,13 @@ jobs:
129129
<<: *deps-install
130130
environment:
131131
NUMPY_VERSION: "==1.7.1"
132-
# Linkchecker only works with python 2.7 for the time being.
133-
# Linkchecker is currently broken with requests 2.10.0 so force an earlier version.
134-
- run: pip install --user $PRE requests==2.9.2 linkchecker
135132
- run: *mpl-install
136133

137134
- run: *doc-build
138135

139136
# We don't build the LaTeX docs here, so linkchecker will complain
140137
- run: touch doc/build/html/Matplotlib.pdf
141138

142-
# Linkchecker only works with python 2.7 for the time being
143-
- run:
144-
name: linkchecker
145-
command: ~/.local/bin/linkchecker build/html/index.html
146-
working_directory: doc
147-
148139
- run: *doc-bundle
149140
- store_artifacts:
150141
path: doc/build/sphinx-gallery-files.tar.gz
@@ -166,4 +157,4 @@ workflows:
166157
build:
167158
jobs:
168159
- docs-python35
169-
- docs-python27
160+
- docs-python36

‎.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ env:
6565

6666
matrix:
6767
include:
68-
- python: 2.7
68+
- python: 3.5
6969
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
7070
env:
7171
- CYCLER=cycler==0.10
@@ -78,7 +78,7 @@ matrix:
7878
- PYTEST=pytest==3.1.0
7979
- PYTEST_COV=pytest-cov==2.3.1
8080
- SPHINX=sphinx==1.3
81-
- python: 3.4
81+
- python: 3.5
8282
env: PYTHON_ARGS=-OO
8383
- python: 3.6
8484
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
@@ -111,7 +111,9 @@ before_install:
111111
else
112112
brew update
113113
brew tap homebrew/gui
114-
brew install python libpng ffmpeg imagemagick mplayer ccache
114+
brew install python3 libpng ffmpeg imagemagick mplayer ccache
115+
# make 'python' mean 'python3'
116+
ln -s /usr/local/bin/python3 /usr/local/bin/python
115117
# We could install ghostscript and inkscape here to test svg and pdf
116118
# but this makes the test time really long.
117119
# brew install ghostscript inkscape

‎INSTALL.rst

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,14 @@ Although not required, we suggest also installing ``IPython`` for
3232
interactive use. To easily install a complete Scientific Python
3333
stack, see :ref:`install_scipy_dists` below.
3434

35-
.. _installing_windows:
36-
37-
Windows
38-
-------
39-
40-
In case Python 2.7 or 3.4 are not installed for all users,
41-
the Microsoft Visual C++ 2008
42-
(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
43-
or
44-
`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=29>`__
45-
for Python 2.7) or Microsoft Visual C++ 2010
46-
(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
47-
or
48-
`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
49-
for Python 3.4) redistributable packages need to be installed.
5035

5136
macOS
5237
-----
5338

54-
If you are using Python 2.7 on a Mac you may need to do::
55-
56-
xcode-select --install
57-
58-
so that *subprocess32*, a dependency, may be compiled.
59-
6039
To use the native OSX backend you will need :ref:`a framework build
6140
<osxframework-faq>` build of Python.
6241

6342

64-
Linux
65-
-----
66-
67-
On extremely old versions of Linux and Python 2.7 you may need to
68-
install the master version of *subprocess32* (`see comments
69-
<https://github.com/google/python-subprocess32/issues/12#issuecomment-304724113>`__).
70-
71-
7243
Test Data
7344
---------
7445

@@ -167,7 +138,7 @@ Dependencies
167138

168139
Matplotlib requires a large number of dependencies:
169140

170-
* `Python <https://www.python.org/downloads/>`_ (>= 2.7 or >= 3.4)
141+
* `Python <https://www.python.org/downloads/>`_ (>= 3.5)
171142
* `NumPy <http://www.numpy.org>`_ (>= |minimum_numpy_version|)
172143
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
173144
* `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.1)
@@ -176,13 +147,9 @@ Matplotlib requires a large number of dependencies:
176147
* `pytz <http://pytz.sourceforge.net/>`__
177148
* FreeType (>= 2.3)
178149
* `cycler <http://matplotlib.org/cycler/>`__ (>= 0.10.0)
179-
* `six <https://pypi.python.org/pypi/six>`_
180-
* `backports.functools_lru_cache <https://pypi.python.org/pypi/backports.functools_lru_cache>`_
181-
(for Python 2.7 only)
182-
* `subprocess32 <https://pypi.python.org/pypi/subprocess32/>`_ (for Python
183-
2.7 only, on Linux and macOS only)
184150
* `kiwisolver <https://github.com/nucleic/kiwi>`__ (>= 1.0.0)
185151

152+
186153
Optionally, you can also install a number of packages to enable better user
187154
interface toolkits. See :ref:`what-is-a-backend` for more details on the
188155
optional Matplotlib backends and the capabilities they provide.
@@ -325,8 +292,6 @@ without fiddling with environment variables::
325292
conda install pyqt
326293
# this package is only available in the conda-forge channel
327294
conda install -c conda-forge msinttypes
328-
# for Python 2.7
329-
conda install -c conda-forge backports.functools_lru_cache
330295

331296
# copy the libs which have "wrong" names
332297
set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib

‎doc/faq/installing_faq.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,6 @@ the disk image installer only works for Python.org Python, and will not get
216216
picked up by other Pythons. If all these fail, please :ref:`let us know
217217
<reporting-problems>`.
218218

219-
Windows Notes
220-
=============
221-
222-
See :ref:`installing_windows`.
223-
224219
.. _install-from-git:
225220

226221
Install from source

0 commit comments

Comments
 (0)