Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 94ae1e0

Browse filesBrowse files
QuLogicQuLogic
authored
Merge pull request #12936 from anntzer/36+
Minor updates following bump to Py3.6+.
2 parents a6d689c + ecb21f7 commit 94ae1e0
Copy full SHA for 94ae1e0

File tree

Expand file treeCollapse file tree

6 files changed

+15
-22
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+15
-22
lines changed

‎INSTALL.rst

Copy file name to clipboardExpand all lines: INSTALL.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ not needed during the wheel install.
275275
::
276276

277277
# create a new environment with the required packages
278-
conda create -n "matplotlib_build" python=3.5 numpy python-dateutil pyparsing pytz tornado cycler tk libpng zlib freetype
278+
conda create -n "matplotlib_build" python=3.7 numpy python-dateutil pyparsing pytz tornado cycler tk libpng zlib freetype
279279
activate matplotlib_build
280280
# if you want a qt backend, you also have to install pyqt (be aware that pyqt doesn't mix well if
281281
# you have created the environment with conda-forge already activated...)

‎build_alllocal.cmd

Copy file name to clipboardExpand all lines: build_alllocal.cmd
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:: This assumes you have installed all the dependencies via conda packages:
22
:: # create a new environment with the required packages
3-
:: conda create -n "matplotlib_build" python=3.5 numpy python-dateutil pyparsing tornado cycler tk libpng zlib freetype
3+
:: conda create -n "matplotlib_build" python=3.7 numpy python-dateutil pyparsing tornado cycler tk libpng zlib freetype
44
:: activate matplotlib_build
55
:: if you want qt backend, you also have to install pyqt
66
:: conda install pyqt

‎doc/devel/testing.rst

Copy file name to clipboardExpand all lines: doc/devel/testing.rst
+6-10Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,12 @@ example <https://travis-ci.org/msabramo/matplotlib>`_.
238238
Using tox
239239
---------
240240

241-
`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running
242-
tests against
243-
multiple Python environments, including multiple versions of Python
244-
(e.g., 3.5, 3.6) and even different Python implementations
245-
altogether (e.g., CPython, PyPy, Jython, etc.)
246-
247-
Testing all versions of Python (3.5, 3.6, ...) requires
248-
having multiple versions of Python installed on your system and on the
249-
PATH. Depending on your operating system, you may want to use your
250-
package manager (such as apt-get, yum or MacPorts) to do this.
241+
`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running tests
242+
against multiple Python environments, including multiple versions of Python
243+
(e.g., 3.6, 3.7) and even different Python implementations altogether
244+
(e.g., CPython, PyPy, Jython, etc.), as long as all these versions are
245+
available on your system's $PATH (consider using your system package manager,
246+
e.g. apt-get, yum, or Homebrew, to install them).
251247

252248
tox makes it easy to determine if your working copy introduced any
253249
regressions before submitting a pull request. Here's how to use it:

‎lib/matplotlib/font_manager.py

Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,8 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
191191
direc = direc.split("\0", 1)[0]
192192
try:
193193
path = Path(directory, direc).resolve()
194-
except (FileNotFoundError, RuntimeError):
195-
# Don't fail with invalid entries (FileNotFoundError is
196-
# only necessary on Py3.5).
194+
except RuntimeError:
195+
# Don't fail with invalid entries.
197196
continue
198197
if path.suffix.lower() in fontext:
199198
items.add(str(path))

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
from setuptools.command.test import test as TestCommand
1212
from setuptools.command.build_ext import build_ext as BuildExtCommand
1313

14-
if sys.version_info < (3, 5):
14+
if sys.version_info < (3, 6):
1515
error = """
16-
Matplotlib 3.0+ does not support Python 2.x, 3.0, 3.1, 3.2, 3.3, or 3.4.
17-
Beginning with Matplotlib 3.0, Python 3.5 and above is required.
16+
Beginning with Matplotlib 3.1, Python 3.6 or above is required.
1817
1918
This may be due to an out of date pip.
2019
@@ -82,7 +81,6 @@
8281
'License :: OSI Approved :: Python Software Foundation License',
8382
'Programming Language :: Python',
8483
'Programming Language :: Python :: 3',
85-
'Programming Language :: Python :: 3.5',
8684
'Programming Language :: Python :: 3.6',
8785
'Programming Language :: Python :: 3.7',
8886
'Topic :: Scientific/Engineering :: Visualization',
@@ -232,7 +230,7 @@ def build_extensions(self):
232230
classifiers=classifiers,
233231
download_url="http://matplotlib.org/users/installing.html",
234232

235-
python_requires='>=3.5',
233+
python_requires='>=3.6',
236234
# List third-party Python packages that we require
237235
install_requires=install_requires,
238236
setup_requires=setup_requires,

‎tutorials/introductory/customizing.py

Copy file name to clipboardExpand all lines: tutorials/introductory/customizing.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@
154154
#
155155
# 4. :file:`{INSTALL}/matplotlib/mpl-data/matplotlibrc`, where
156156
# :file:`{INSTALL}` is something like
157-
# :file:`/usr/lib/python3.5/site-packages` on Linux, and maybe
158-
# :file:`C:\\Python35\\Lib\\site-packages` on Windows. Every time you
157+
# :file:`/usr/lib/python3.7/site-packages` on Linux, and maybe
158+
# :file:`C:\\Python37\\Lib\\site-packages` on Windows. Every time you
159159
# install matplotlib, this file will be overwritten, so if you want
160160
# your customizations to be saved, please move this file to your
161161
# user-specific matplotlib directory.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.