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

Skip to content

Commit 1acf1b5

Browse files
timhoffmtimhoffm
authored
Merge pull request #17662 from tacaswell/mnt_drop_py36
Mnt drop py36
2 parents aeec4ec + 2295a0e commit 1acf1b5

File tree

14 files changed

+63
-49
lines changed

14 files changed

+63
-49
lines changed

‎.appveyor.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ environment:
2323
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
2424
# the envs anyway. But using one for the right python version hopefully
2525
# making things faster due to package caching.
26-
- PYTHON_VERSION: "3.6"
27-
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
26+
- PYTHON_VERSION: "3.7"
27+
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
2828
TEST_ALL: "no"
2929
EXTRAREQS: "-r requirements/testing/travis_extra.txt"
30-
- PYTHON_VERSION: "3.7"
30+
- PYTHON_VERSION: "3.8"
3131
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
3232
TEST_ALL: "no"
33+
EXTRAREQS: "-r requirements/testing/travis_extra.txt"
3334

3435
# We always use a 64-bit machine, but can build x86 distributions
3536
# with the PYTHON_ARCH variable
@@ -55,19 +56,15 @@ install:
5556
# For building, use a new environment
5657
- conda create -q -n test-environment python=%PYTHON_VERSION% tk
5758
- activate test-environment
59+
# pull pywin32 from conda because on py38 there is something wrong with finding
60+
# the dlls when insalled from pip
61+
- conda install -c conda-forge pywin32
5862
- echo %PYTHON_VERSION% %TARGET_ARCH%
5963
# Install dependencies from PyPI.
6064
- python -mpip install --upgrade -r requirements/testing/travis_all.txt %EXTRAREQS% %PINNEDVERS%
6165
# Install optional dependencies from PyPI.
6266
# Sphinx is needed to run sphinxext tests
6367
- python -mpip install --upgrade sphinx
64-
65-
# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
66-
# https://github.com/matplotlib/matplotlib/issues/9176
67-
- python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
68-
curl -sL https://github.com/python/cpython/pull/1224.patch |
69-
patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"
70-
7168
# Show the installed packages + versions
7269
- conda list
7370

‎.circleci/config.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,17 @@ commands:
110110
#
111111

112112
jobs:
113-
docs-python36:
113+
docs-python37:
114114
docker:
115-
- image: circleci/python:3.6
115+
- image: circleci/python:3.7
116116
steps:
117117
- checkout
118118

119119
- apt-install
120120
- fonts-install
121121
- pip-install
122-
- deps-install:
123-
numpy_version: "==1.13.0"
122+
123+
- deps-install
124124
- mpl-install
125125

126126
- doc-build
@@ -130,17 +130,18 @@ jobs:
130130
- store_artifacts:
131131
path: doc/build/html
132132

133-
docs-python37:
133+
docs-python38-min:
134134
docker:
135-
- image: circleci/python:3.7
135+
- image: circleci/python:3.8
136136
steps:
137137
- checkout
138138

139139
- apt-install
140140
- fonts-install
141141
- pip-install
142142

143-
- deps-install
143+
- deps-install:
144+
numpy_version: "==1.16.0"
144145
- mpl-install
145146

146147
- doc-build
@@ -185,6 +186,6 @@ workflows:
185186
version: 2
186187
build:
187188
jobs:
188-
- docs-python36
189189
- docs-python37
190190
- docs-python38
191+
- docs-python38-min

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ env:
7373

7474
matrix:
7575
include:
76-
- python: 3.6
76+
- python: 3.7
7777
env:
78-
- PINNEDVERS='-c requirements/testing/travis36minver.txt'
78+
- PINNEDVERS='-c requirements/testing/minver.txt'
7979
- DELETE_FONT_CACHE=1
8080
- python: 3.7
8181
env:

‎INSTALL.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@ Matplotlib will automatically install dependencies when you install with
143143

144144
Matplotlib requires the following dependencies:
145145

146-
* `Python <https://www.python.org/downloads/>`_ (>= 3.6)
147-
* `NumPy <https://numpy.org>`_ (>= 1.15)
146+
* `Python <https://www.python.org/downloads/>`_ (>= 3.7)
147+
* `NumPy <https://numpy.org>`_ (>= 1.16)
148148
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
149149
* `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
150-
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.1)
151-
* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.0)
150+
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.7)
151+
* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.1)
152152
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 6.2)
153-
* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>=2.0.3)
153+
* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>=2.2.1)
154154

155155
Optionally, you can also install a number of packages to enable better user
156156
interface toolkits. See :ref:`what-is-a-backend` for more details on the

‎azure-pipelines.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,18 @@
55

66
strategy:
77
matrix:
8-
Linux_py36:
9-
vmImage: 'ubuntu-16.04'
10-
python.version: '3.6'
118
Linux_py37:
129
vmImage: 'ubuntu-16.04'
1310
python.version: '3.7'
1411
Linux_py38:
1512
vmImage: 'ubuntu-16.04'
1613
python.version: '3.8'
17-
macOS_py36:
18-
vmImage: 'macOS-10.14'
19-
python.version: '3.6'
2014
macOS_py37:
2115
vmImage: 'macOS-10.15'
2216
python.version: '3.7'
2317
macOS_py38:
2418
vmImage: 'macOS-latest'
2519
python.version: '3.8'
26-
Windows_py36:
27-
vmImage: 'vs2017-win2016'
28-
python.version: '3.6'
2920
Windows_py37:
3021
vmImage: 'vs2017-win2016'
3122
python.version: '3.7'

‎doc/api/next_api_changes/deprecations/17662-TAC.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Increase minimum supported versions of Python and dependencies
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
5+
For Maptlotlib 3.4 the :ref:`minimum supported versions
6+
<install_requirements>` are being bumped
7+
8+
+------------+-----------------+---------------+
9+
| Dependency | min in mpl3.3 | min in mpl3.4 |
10+
+============+=================+===============+
11+
| Python | 3.6 | 3.7 |
12+
+------------+-----------------+---------------+
13+
| dateutil | 2.1 | 2.2.1 |
14+
+------------+-----------------+---------------+
15+
| numpy | 1.15 | 1.16 |
16+
+------------+-----------------+---------------+
17+
| pyparsing | 2.0.3 | 2.2.1 |
18+
+------------+-----------------+---------------+
19+
20+
21+
This consistent with our :ref:`min_deps_policy` and `NEP29
22+
<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__

‎doc/devel/coding_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ The current active branches are
255255

256256
*master*
257257
The current development version. Future minor releases (*v3.N.0*) will be
258-
branched from this. Supports Python 3.6+.
258+
branched from this. Supports Python 3.7+.
259259

260260
*v3.N.x*
261261
Maintenance branch for Matplotlib 3.N. Future patch releases will be

‎doc/devel/min_dep_policy.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ specification of the dependencies.
8383
========== ======== ======
8484
Matplotlib Python NumPy
8585
========== ======== ======
86-
3.3 3.6 1.15.0
86+
3.4 3.7 1.16.0
87+
`3.3`_ 3.6 1.15.0
8788
`3.2`_ 3.6 1.11.0
8889
`3.1`_ 3.6 1.11.0
8990
`3.0`_ 3.5 1.10.0
@@ -98,6 +99,7 @@ Matplotlib Python NumPy
9899
1.0 2.4 1.1
99100
========== ======== ======
100101

102+
.. _`3.3`: https://matplotlib.org/3.3.0/users/installing.html#dependencies
101103
.. _`3.2`: https://matplotlib.org/3.2.0/users/installing.html#dependencies
102104
.. _`3.1`: https://matplotlib.org/3.1.0/users/installing.html#dependencies
103105
.. _`3.0`: https://matplotlib.org/3.0.0/users/installing.html#dependencies

‎doc/devel/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ You can also run tox on a subset of environments:
243243

244244
.. code-block:: bash
245245
246-
$ tox -e py36,py37
246+
$ tox -e py37,py38
247247
248248
Tox processes everything serially so it can take a long time to test
249249
several environments. To speed it up, you might try using a new,

‎doc/faq/installing_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ the form of wheels.
105105
pip is installed by default with python.org and Homebrew Python, but needs to
106106
be manually installed on Macports with ::
107107

108-
sudo port install py36-pip
108+
sudo port install py38-pip
109109

110110
Once pip is installed, you can install Matplotlib and all its dependencies with
111111
from the Terminal.app command line::

‎requirements/testing/minver.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Extra pip requirements for the minimum-version travis run
2+
3+
cycler==0.10
4+
python-dateutil==2.7
5+
numpy==1.16.0
6+
pyparsing==2.2.1
7+
kiwisolver==1.0.1

‎requirements/testing/travis36minver.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# and/or pip.
99
import sys
1010

11-
min_version = (3, 6)
11+
min_version = (3, 7)
1212

1313
if sys.version_info < min_version:
1414
error = """
@@ -280,10 +280,10 @@ def build_extensions(self):
280280
install_requires=[
281281
"cycler>=0.10",
282282
"kiwisolver>=1.0.1",
283-
"numpy>=1.15",
283+
"numpy>=1.16",
284284
"pillow>=6.2.0",
285-
"pyparsing>=2.0.3,!=2.0.4,!=2.1.2,!=2.1.6",
286-
"python-dateutil>=2.1",
285+
"pyparsing>=2.2.1",
286+
"python-dateutil>=2.7",
287287
],
288288

289289
cmdclass=cmdclass,

‎tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py36, py37, py38
7+
envlist = py37, py38
88

99
[testenv]
1010
changedir = /tmp

0 commit comments

Comments
 (0)