Skip to content

Commit c53e850

Browse 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 bba8e9e commit c53e850

File tree

13 files changed

+33
-47
lines changed

13 files changed

+33
-47
lines changed

‎.appveyor.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ environment:
2121
PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
2222

2323
matrix:
24-
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
25-
# the envs anyway. But using one for the right python version hopefully
26-
# making things faster due to package caching.
27-
- PYTHON_VERSION: "3.7"
28-
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
24+
- PYTHON_VERSION: "3.8"
25+
CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
2926
TEST_ALL: "no"
3027
EXTRAREQS: "-r requirements/testing/extra.txt"
31-
- PYTHON_VERSION: "3.8"
32-
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
28+
- PYTHON_VERSION: "3.9"
29+
CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
3330
TEST_ALL: "no"
3431
EXTRAREQS: "-r requirements/testing/extra.txt"
3532

‎.github/workflows/cibuildwheel.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/setup-python@v2
5454
name: Install Python
5555
with:
56-
python-version: '3.7'
56+
python-version: '3.8'
5757

5858
- uses: actions/cache@v2
5959
id: numpy-cache
@@ -73,7 +73,7 @@ jobs:
7373
cd numpy-${{ env.min-numpy-version }}
7474
python -m cibuildwheel --output-dir ../numpy-aarch64-cache
7575
env:
76-
CIBW_BUILD: "cp37-* cp38-*"
76+
CIBW_BUILD: "cp38-*"
7777
CIBW_ARCHS: aarch64
7878

7979
- name: Build wheels for CPython 3.10
@@ -102,7 +102,7 @@ jobs:
102102
run: |
103103
python -m cibuildwheel --output-dir dist
104104
env:
105-
CIBW_BUILD: "cp37-* cp38-*"
105+
CIBW_BUILD: "cp38-*"
106106
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
107107
CIBW_MANYLINUX_I686_IMAGE: manylinux1
108108
CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
@@ -113,7 +113,7 @@ jobs:
113113
run: |
114114
python -m cibuildwheel --output-dir dist
115115
env:
116-
CIBW_BUILD: "pp37-*"
116+
CIBW_BUILD: "pp38-*"
117117
CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
118118
CIBW_ARCHS: ${{ matrix.cibw_archs }}
119119
PIP_USE_FEATURE: in-tree-build

‎.github/workflows/tests.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,16 @@ jobs:
2626
include:
2727
- name-suffix: "(Minimum Versions)"
2828
os: ubuntu-18.04
29-
python-version: 3.7
29+
python-version: 3.8
3030
extra-requirements: '-c requirements/testing/minver.txt'
31-
pyqt5-ver: '==5.8 sip==4.19.7' # oldest versions with a Py3.7 wheel.
31+
pyqt5-ver: '==5.11.2 sip==5.0.0' # oldest versions with a Py3.8 wheel.
3232
delete-font-cache: true
3333
XVFB_RUN: xvfb-run -a
34-
- os: ubuntu-18.04
35-
python-version: 3.7
36-
extra-requirements: '-r requirements/testing/extra.txt'
37-
XVFB_RUN: xvfb-run -a
38-
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
3934
- os: ubuntu-18.04
4035
python-version: 3.8
4136
extra-requirements: '-r requirements/testing/extra.txt'
4237
XVFB_RUN: xvfb-run -a
38+
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
4339
- os: ubuntu-20.04
4440
python-version: 3.9
4541
extra-requirements: '-r requirements/testing/extra.txt'

‎azure-pipelines.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ stages:
3838
- job: Pytest
3939
strategy:
4040
matrix:
41-
Linux_py37:
42-
vmImage: 'ubuntu-18.04'
43-
python.version: '3.7'
4441
Linux_py38:
4542
vmImage: 'ubuntu-18.04'
4643
python.version: '3.8'
4744
Linux_py39:
4845
vmImage: 'ubuntu-18.04'
4946
python.version: '3.9'
50-
macOS_py37:
51-
vmImage: 'macOS-10.15'
52-
python.version: '3.7'
47+
Linux_py310:
48+
vmImage: 'ubuntu-18.04'
49+
python.version: '3.10'
5350
macOS_py38:
5451
vmImage: 'macOS-latest'
5552
python.version: '3.8'
5653
macOS_py39:
5754
vmImage: 'macOS-latest'
5855
python.version: '3.9'
59-
Windows_py37:
60-
vmImage: 'vs2017-win2016'
61-
python.version: '3.7'
56+
macOS_py310:
57+
vmImage: 'macOS-latest'
58+
python.version: '3.10'
6259
Windows_py38:
6360
vmImage: 'windows-latest'
6461
python.version: '3.8'
6562
Windows_py39:
6663
vmImage: 'windows-latest'
6764
python.version: '3.9'
65+
Windows_py310:
66+
vmImage: 'vs2017-win2016'
67+
python.version: '3.10'
6868
maxParallel: 4
6969
pool:
7070
vmImage: '$(vmImage)'

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

+1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ The current active branches are
271271

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

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

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

‎doc/devel/dependencies.rst

+1-1
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

+1-1
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

+2-2
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

+2-3
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

+1-1
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

+2-9
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

+1-1
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)