Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit41b4f3c

Browse files
committed
API: bump minimum version of Python to 3.7 for mpl 3.4
This is consistent with our policy and NEP29
1 parent84ad9a5 commit41b4f3c

File tree

11 files changed

+15
-48
lines changed

11 files changed

+15
-48
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: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,6 @@ commands:
110110
#
111111

112112
jobs:
113-
docs-python36:
114-
docker:
115-
-image:circleci/python:3.6
116-
steps:
117-
-checkout
118-
119-
-apt-install
120-
-fonts-install
121-
-pip-install
122-
-deps-install:
123-
numpy_version:"==1.13.0"
124-
-mpl-install
125-
126-
-doc-build
127-
128-
-doc-bundle
129-
130-
-store_artifacts:
131-
path:doc/build/html
132-
133113
docs-python37:
134114
docker:
135115
-image:circleci/python:3.7
@@ -185,6 +165,5 @@ workflows:
185165
version:2
186166
build:
187167
jobs:
188-
-docs-python36
189168
-docs-python37
190169
-docs-python38

‎.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Dependencies
115115

116116
Matplotlib requires the following dependencies:
117117

118-
* `Python<https://www.python.org/downloads/>`_ (>= 3.6)
118+
* `Python<https://www.python.org/downloads/>`_ (>= 3.7)
119119
* `NumPy<https://numpy.org>`_ (>= 1.16)
120120
* `setuptools<https://setuptools.readthedocs.io/en/latest/>`_
121121
* `cycler<https://matplotlib.org/cycler/>`_ (>= 0.10.0)

‎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/devel/coding_guide.rst

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

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

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

‎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 -epy36,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 installpy36-pip
108+
sudo port installpy38-pip
109109

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

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# and/or pip.
99
importsys
1010

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

1313
ifsys.version_info<min_version:
1414
error="""

‎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)
[8]ページ先頭
©2009-2025 Movatter.jp