Merge pull request #7058 from hugovk/rm-3.7

Drop support for soon-EOL Python 3.7
python-pillow · Apr 3, 2023 · b53ca82 · b53ca82
2 parents 4f7070e + f36f242
commit b53ca82
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 18 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -13,7 +13,7 @@ environment:
   - PYTHON: C:/Python311
     ARCHITECTURE: x86
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-  - PYTHON: C:/Python37-x64
+  - PYTHON: C:/Python38-x64
     ARCHITECTURE: x64
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
@@ -31,7 +31,7 @@ install:
 - path c:\nasm-2.15.05;C:\Program Files\gs\gs10.00.0\bin;%PATH%
 - cd c:\pillow\winbuild\
 - ps: |
-        c:\python37\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
+        c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
         c:\pillow\winbuild\build\build_dep_all.cmd
         $host.SetShouldExit(0)
 - path C:\pillow\winbuild\build\bin;%PATH%

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12-dev"]
         architecture: ["x86", "x64"]
         include:
           # PyPy 7.3.4+ only ships 64-bit binaries for Windows

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,10 +36,9 @@ jobs:
           "3.10",
           "3.9",
           "3.8",
-          "3.7",
         ]
         include:
-        - python-version: "3.7"
+        - python-version: "3.9"
           PYTHONOPTIMIZE: 1
           REVERSE: "--reverse"
         - python-version: "3.8"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ repos:
     rev: 23.1.0
     hooks:
       - id: black
-        args: [--target-version=py37]
+        args: [--target-version=py38]
         # Only .py files, until https://github.com/psf/black/issues/402 resolved
         files: \.py$
         types: []

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,5 +1,10 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 python:
   install:
     - method: pip

diff --git a/Makefile b/Makefile
@@ -123,5 +123,5 @@ lint:
 lint-fix:
 	python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black
 	python3 -c "import isort" > /dev/null 2>&1 || python3 -m pip install isort
-	python3 -m black --target-version py37 .
+	python3 -m black --target-version py38 .
 	python3 -m isort .
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -434,7 +434,7 @@ These platforms are built and tested for every change.
 +==================================+============================+=====================+
 | Alpine                           | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| Amazon Linux 2                   | 3.7                        | x86-64              |
+| Amazon Linux 2                   | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Amazon Linux 2023                | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
@@ -454,22 +454,22 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Gentoo                           | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| macOS 12 Monterey                | 3.7, 3.8, 3.9, 3.10, 3.11, | x86-64              |
+| macOS 12 Monterey                | 3.8, 3.9, 3.10, 3.11,      | x86-64              |
 |                                  | 3.12, PyPy3                |                     |
 +----------------------------------+----------------------------+---------------------+
 | Ubuntu Linux 18.04 LTS (Bionic)  | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Ubuntu Linux 20.04 LTS (Focal)   | 3.8                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| Ubuntu Linux 22.04 LTS (Jammy)   | 3.7, 3.8, 3.9, 3.10, 3.11, | x86-64              |
+| Ubuntu Linux 22.04 LTS (Jammy)   | 3.8, 3.9, 3.10, 3.11,      | x86-64              |
 |                                  | 3.12, PyPy3                |                     |
 |                                  +----------------------------+---------------------+
 |                                  | 3.10                       | arm64v8, ppc64le,   |
 |                                  |                            | s390x               |
 +----------------------------------+----------------------------+---------------------+
-| Windows Server 2016              | 3.7                        | x86-64              |
+| Windows Server 2016              | 3.8                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| Windows Server 2022              | 3.7, 3.8, 3.9, 3.10, 3.11, | x86, x86-64         |
+| Windows Server 2022              | 3.8, 3.9, 3.10, 3.11,      | x86, x86-64         |
 |                                  | 3.12, PyPy3                |                     |
 |                                  +----------------------------+---------------------+
 |                                  | 3.9 (MinGW)                | x86, x86-64         |

diff --git a/docs/newer-versions.csv b/docs/newer-versions.csv
@@ -1,5 +1,6 @@
 Python,3.11,3.10,3.9,3.8,3.7,3.6,3.5
-Pillow >= 9.3,Yes,Yes,Yes,Yes,Yes,,
+Pillow >= 10,Yes,Yes,Yes,Yes,,,
+Pillow 9.3 - 9.5,Yes,Yes,Yes,Yes,Yes,,
 Pillow 9.0 - 9.2,,Yes,Yes,Yes,Yes,,
 Pillow 8.3.2 - 8.4,,Yes,Yes,Yes,Yes,Yes,
 Pillow 8.0 - 8.3.1,,,Yes,Yes,Yes,Yes,

diff --git a/setup.cfg b/setup.cfg
@@ -12,7 +12,6 @@ classifiers =
     License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
@@ -36,7 +35,7 @@ project_urls =
 
 [options]
 packages = PIL
-python_requires = >=3.7
+python_requires = >=3.8
 include_package_data = True
 package_dir =
     = src

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint
-    py{py3, 311, 310, 39, 38, 37}
+    py{py3, 311, 310, 39, 38}
 minversion = 1.9
 
 [testenv]

diff --git a/winbuild/README.md b/winbuild/README.md
@@ -18,7 +18,7 @@ The following is a simplified version of the script used on AppVeyor:
 ```
 set PYTHON=C:\Python38\bin
 cd /D C:\Pillow\winbuild
-C:\Python37\bin\python.exe build_prepare.py -v --depends=C:\pillow-depends
+C:\Python39\bin\python.exe build_prepare.py -v --depends=C:\pillow-depends
 build\build_dep_all.cmd
 build\build_pillow.cmd install
 cd ..

diff --git a/winbuild/build.rst b/winbuild/build.rst
@@ -112,7 +112,7 @@ The following is a simplified version of the script used on AppVeyor::
 
     set PYTHON=C:\Python38\bin
     cd /D C:\Pillow\winbuild
-    C:\Python37\bin\python.exe build_prepare.py -v --depends C:\pillow-depends
+    C:\Python39\bin\python.exe build_prepare.py -v --depends C:\pillow-depends
     build\build_dep_all.cmd
     build\build_pillow.cmd install
     cd ..