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 fa80f6a

Browse filesBrowse files
QuLogicQuLogic
committed
Drop support for Python 3.7
According to NEP 29 [1], Python 3.7 support should be dropped after Dec 26, 2021. As Matplotlib 3.6 will be out a few months from now, it is already time to be dropping 3.7. [1] https://numpy.org/neps/nep-0029-deprecation_policy.html#support-table
1 parent ba956c3 commit fa80f6a
Copy full SHA for fa80f6a

File tree

13 files changed

+32
-43
lines changed
Filter options

13 files changed

+32
-43
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ environment:
2424
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
2525
# the envs anyway. But using one for the right python version hopefully
2626
# making things faster due to package caching.
27-
- PYTHON_VERSION: "3.7"
28-
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
27+
- PYTHON_VERSION: "3.8"
28+
CONDA_INSTALL_LOCN: "C:\\Miniconda38-x64"
2929
TEST_ALL: "no"
3030
EXTRAREQS: "-r requirements/testing/extra.txt"
31-
- PYTHON_VERSION: "3.8"
32-
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
31+
- PYTHON_VERSION: "3.9"
32+
CONDA_INSTALL_LOCN: "C:\\Miniconda39-x64"
3333
TEST_ALL: "no"
3434
EXTRAREQS: "-r requirements/testing/extra.txt"
3535

‎.github/workflows/cibuildwheel.yml

Copy file name to clipboardExpand all lines: .github/workflows/cibuildwheel.yml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/setup-python@v2
3939
name: Install Python
4040
with:
41-
python-version: '3.7'
41+
python-version: '3.8'
4242

4343
- uses: actions/cache@v2
4444
id: numpy-cache
@@ -58,7 +58,7 @@ jobs:
5858
cd numpy-${{ env.min-numpy-version }}
5959
python -m cibuildwheel --output-dir ../numpy-aarch64-cache
6060
env:
61-
CIBW_BUILD: "cp37-* cp38-*"
61+
CIBW_BUILD: "cp38-*"
6262
CIBW_ARCHS: aarch64
6363

6464
- name: Build wheels for CPython 3.10
@@ -87,7 +87,7 @@ jobs:
8787
run: |
8888
python -m cibuildwheel --output-dir dist
8989
env:
90-
CIBW_BUILD: "cp37-* cp38-*"
90+
CIBW_BUILD: "cp38-*"
9191
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
9292
CIBW_MANYLINUX_I686_IMAGE: manylinux1
9393
CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}

‎.github/workflows/tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/tests.yml
+3-7Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,16 @@ jobs:
2424
include:
2525
- name-suffix: "(Minimum Versions)"
2626
os: ubuntu-18.04
27-
python-version: 3.7
27+
python-version: 3.8
2828
extra-requirements: '-c requirements/testing/minver.txt'
29-
pyqt5-ver: '==5.8 sip==4.19.7' # oldest versions with a Py3.7 wheel.
29+
pyqt5-ver: '==5.11.2 sip==5.0.0' # oldest versions with a Py3.8 wheel.
3030
delete-font-cache: true
3131
XVFB_RUN: xvfb-run -a
32-
- os: ubuntu-18.04
33-
python-version: 3.7
34-
extra-requirements: '-r requirements/testing/extra.txt'
35-
XVFB_RUN: xvfb-run -a
36-
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
3732
- os: ubuntu-18.04
3833
python-version: 3.8
3934
extra-requirements: '-r requirements/testing/extra.txt'
4035
XVFB_RUN: xvfb-run -a
36+
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
4137
- os: ubuntu-20.04
4238
python-version: 3.9
4339
extra-requirements: '-r requirements/testing/extra.txt'

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,33 @@ stages:
2929
- job: Pytest
3030
strategy:
3131
matrix:
32-
Linux_py37:
33-
vmImage: 'ubuntu-18.04'
34-
python.version: '3.7'
3532
Linux_py38:
3633
vmImage: 'ubuntu-18.04'
3734
python.version: '3.8'
3835
Linux_py39:
3936
vmImage: 'ubuntu-18.04'
4037
python.version: '3.9'
41-
macOS_py37:
42-
vmImage: 'macOS-10.15'
43-
python.version: '3.7'
38+
Linux_py310:
39+
vmImage: 'ubuntu-18.04'
40+
python.version: '3.10'
4441
macOS_py38:
4542
vmImage: 'macOS-latest'
4643
python.version: '3.8'
4744
macOS_py39:
4845
vmImage: 'macOS-latest'
4946
python.version: '3.9'
50-
Windows_py37:
51-
vmImage: 'vs2017-win2016'
52-
python.version: '3.7'
47+
macOS_py310:
48+
vmImage: 'macOS-10.15'
49+
python.version: '3.10'
5350
Windows_py38:
5451
vmImage: 'windows-latest'
5552
python.version: '3.8'
5653
Windows_py39:
5754
vmImage: 'windows-latest'
5855
python.version: '3.9'
56+
Windows_py310:
57+
vmImage: 'vs2017-win2016'
58+
python.version: '3.10'
5959
maxParallel: 4
6060
pool:
6161
vmImage: '$(vmImage)'

‎doc/api/next_api_changes/development/22205-ES.rst

Copy file name to clipboardExpand all lines: doc/api/next_api_changes/development/22205-ES.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ being bumped:
77
+------------+-----------------+---------------+
88
| Dependency | min in mpl3.5 | min in mpl3.6 |
99
+============+=================+===============+
10+
| Python | 3.7 | 3.8 |
1011
| NumPy | 1.17 | 1.19 |
1112
+------------+-----------------+---------------+
1213

‎doc/devel/coding_guide.rst

Copy file name to clipboardExpand all lines: doc/devel/coding_guide.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,11 @@ The current active branches are
269269

270270
*main*
271271
The current development version. Future minor releases (*v3.N.0*) will be
272-
branched from this. Supports Python 3.7+.
272+
branched from this.
273273

274274
*v3.N.x*
275275
Maintenance branch for Matplotlib 3.N. Future patch releases will be
276-
branched from this. Supports Python 3.6+.
276+
branched from this.
277277

278278
*v3.N.M-doc*
279279
Documentation for the current release. On a patch release, this will be

‎doc/devel/dependencies.rst

Copy file name to clipboardExpand all lines: doc/devel/dependencies.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ When installing through a package manager like ``pip`` or ``conda``, the
1414
mandatory dependencies are automatically installed. This list is mainly for
1515
reference.
1616

17-
* `Python <https://www.python.org/downloads/>`_ (>= 3.7)
17+
* `Python <https://www.python.org/downloads/>`_ (>= 3.8)
1818
* `NumPy <https://numpy.org>`_ (>= 1.19)
1919
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
2020
* `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)

‎doc/devel/min_dep_policy.rst

Copy file name to clipboardExpand all lines: doc/devel/min_dep_policy.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ specification of the dependencies.
8383
========== ======== ======
8484
Matplotlib Python NumPy
8585
========== ======== ======
86-
`3.6`_ 3.7 1.19.0
86+
`3.6`_ 3.8 1.19.0
8787
`3.5`_ 3.7 1.17.0
8888
`3.4`_ 3.7 1.16.0
8989
`3.3`_ 3.6 1.15.0

‎doc/devel/testing.rst

Copy file name to clipboardExpand all lines: doc/devel/testing.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Using tox
169169

170170
`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running tests
171171
against multiple Python environments, including multiple versions of Python
172-
(e.g., 3.6, 3.7) and even different Python implementations altogether
172+
(e.g., 3.7, 3.8) and even different Python implementations altogether
173173
(e.g., CPython, PyPy, Jython, etc.), as long as all these versions are
174174
available on your system's $PATH (consider using your system package manager,
175175
e.g. apt-get, yum, or Homebrew, to install them).
@@ -186,7 +186,7 @@ You can also run tox on a subset of environments:
186186

187187
.. code-block:: bash
188188
189-
$ tox -e py37,py38
189+
$ tox -e py38,py39
190190
191191
Tox processes everything serially so it can take a long time to test
192192
several environments. To speed it up, you might try using a new,

‎lib/matplotlib/tests/test_ticker.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_ticker.py
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -908,13 +908,12 @@ def logit_deformatter(string):
908908
float 1.41e-4, as '0.5' or as r'$\mathdefault{\frac{1}{2}}$' in float
909909
0.5,
910910
"""
911-
# Can inline the Unicode escapes to the raw strings in Python 3.8+
912911
match = re.match(
913912
r"[^\d]*"
914-
r"(?P<comp>1" "[-\N{Minus Sign}]" r")?"
913+
r"(?P<comp>1[-\N{Minus Sign}])?"
915914
r"(?P<mant>\d*\.?\d*)?"
916915
r"(?:\\cdot)?"
917-
r"(?:10\^\{(?P<expo>" "[-\N{Minus Sign}]" r"?\d*)})?"
916+
r"(?:10\^\{(?P<expo>[-\N{Minus Sign}]?\d*)})?"
918917
r"[^\d]*$",
919918
string,
920919
)

‎requirements/testing/extra.txt

Copy file name to clipboardExpand all lines: requirements/testing/extra.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Extra pip requirements for the Python 3.7+ builds
1+
# Extra pip requirements for the Python 3.8+ builds
22

33
ipykernel
44
nbconvert[execute]!=6.0.0,!=6.0.1

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+2-9Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
# and/or pip.
99
import sys
1010

11-
py_min_version = (3, 7) # minimal supported python version
12-
since_mpl_version = (3, 4) # py_min_version is required since this mpl version
11+
py_min_version = (3, 8) # minimal supported python version
12+
since_mpl_version = (3, 6) # py_min_version is required since this mpl version
1313

1414
if sys.version_info < py_min_version:
1515
error = """
@@ -160,12 +160,6 @@ def prepare_flags(name, enable_lto):
160160
return env
161161

162162
def build_extensions(self):
163-
# Remove the -Wstrict-prototypes option, it's not valid for C++. Fixed
164-
# in Py3.7 as bpo-5755.
165-
try:
166-
self.compiler.compiler_so.remove('-Wstrict-prototypes')
167-
except (ValueError, AttributeError):
168-
pass
169163
if (self.compiler.compiler_type == 'msvc' and
170164
os.environ.get('MPL_DISABLE_FH4')):
171165
# Disable FH4 Exception Handling implementation so that we don't
@@ -289,7 +283,6 @@ def make_release_tree(self, base_dir, files):
289283
'License :: OSI Approved :: Python Software Foundation License',
290284
'Programming Language :: Python',
291285
'Programming Language :: Python :: 3',
292-
'Programming Language :: Python :: 3.7',
293286
'Programming Language :: Python :: 3.8',
294287
'Programming Language :: Python :: 3.9',
295288
'Programming Language :: Python :: 3.10',

‎tox.ini

Copy file name to clipboardExpand all lines: tox.ini
+1-1Lines 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 = py37, py38
7+
envlist = py38, py39, py310
88

99
[testenv]
1010
changedir = /tmp

0 commit comments

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