diff --git a/.appveyor.yml b/.appveyor.yml index ad783f85e..965edb67f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,7 +14,7 @@ environment: matrix: - PYTHON: C:/Python38 ARCHITECTURE: x86 - - PYTHON: C:/Python35-x64 + - PYTHON: C:/Python36-x64 ARCHITECTURE: x64 diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 83dc5748b..ddee39a19 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.5", "3.6", "3.7", "3.8", "pypy3"] + python-version: ["3.6", "3.7", "3.8", "pypy3"] architecture: ["x86", "x64"] include: - architecture: "x86" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b8d2c6374..5a369956c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,13 +17,12 @@ jobs: "3.8", "3.7", "3.6", - "3.5", ] include: - - python-version: "3.5" - env: PYTHONOPTIMIZE=2 - python-version: "3.6" env: PYTHONOPTIMIZE=1 + - python-version: "3.7" + env: PYTHONOPTIMIZE=2 # Include new variables for Codecov - os: ubuntu-latest codecov-flag: GHA_Ubuntu diff --git a/.travis.yml b/.travis.yml index 980506368..d4c8bb18a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: arch: arm64 - python: "3.7" arch: ppc64le - - python: "3.5" + - python: "3.8" arch: s390x - python: "pypy3" @@ -36,15 +36,12 @@ matrix: services: xvfb - python: '3.7' name: "3.7 Xenial" + env: PYTHONOPTIMIZE=2 services: xvfb - python: '3.6' name: "3.6 Xenial PYTHONOPTIMIZE=1" env: PYTHONOPTIMIZE=1 services: xvfb - - python: '3.5' - name: "3.5 Xenial PYTHONOPTIMIZE=2" - env: PYTHONOPTIMIZE=2 - services: xvfb install: - | diff --git a/docs/installation.rst b/docs/installation.rst index e46bdf56c..24f895b85 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -19,7 +19,9 @@ Notes +--------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ |**Python** |**3.8**|**3.7**|**3.6**|**3.5**|**3.4**|**3.3**|**3.2**|**2.7**|**2.6**|**2.5**|**2.4**| +--------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ -|Pillow >= 7 | Yes | Yes | Yes | Yes | | | | | | | | +|Pillow >= 7.3 | Yes | Yes | Yes | | | | | | | | | ++--------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ +|Pillow 7.0 - 7.2 | Yes | Yes | Yes | Yes | | | | | | | | +--------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ |Pillow 6.2.1 - 6.2.2| Yes | Yes | Yes | Yes | | | | Yes | | | | +--------------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+ diff --git a/setup.py b/setup.py index b7982a5ba..59f6d2970 100755 --- a/setup.py +++ b/setup.py @@ -880,7 +880,6 @@ try: "Development Status :: 6 - Mature", "License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)", # noqa: E501 "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", @@ -893,7 +892,7 @@ try: "Topic :: Multimedia :: Graphics :: Graphics Conversion", "Topic :: Multimedia :: Graphics :: Viewers", ], - python_requires=">=3.5", + python_requires=">=3.6", cmdclass={"build_ext": pil_build_ext}, ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], include_package_data=True, diff --git a/tox.ini b/tox.ini index aa6875374..22ca36daf 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ [tox] envlist = lint - py{35,36,37,38,py3} + py{36,37,38,py3} minversion = 1.9 [testenv] diff --git a/winbuild/README.md b/winbuild/README.md index d46361c9e..b7d1c548f 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -6,7 +6,7 @@ For more extensive info, see the [Windows build instructions](build.rst). * See [Current Windows Build/Testing process (Pillow#553)](https://github.com/python-pillow/Pillow/issues/553#issuecomment-37877416), [Definitive docs for how to compile on Windows (matplotlib#1717)](https://github.com/matplotlib/matplotlib/issues/1717#issuecomment-13343859), [Test Windows with GitHub Actions (Pillow#4084)](https://github.com/python-pillow/Pillow/pull/4084). - + * Requires Microsoft Visual Studio 2017 or newer with C++ component. * Requires NASM for libjpeg-turbo, a required dependency when using this script. @@ -17,7 +17,7 @@ For more extensive info, see the [Windows build instructions](build.rst). The following is a simplified version of the script used on AppVeyor: ``` -set PYTHON=C:\Python35\bin +set PYTHON=C:\Python38\bin cd /D C:\Pillow\winbuild C:\Python37\bin\python.exe build_prepare.py -v --depends=C:\pillow-depends build\build_dep_all.cmd diff --git a/winbuild/build.rst b/winbuild/build.rst index 517843a66..3122b79e6 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -104,7 +104,7 @@ The following is a simplified version of the script used on AppVeyor: .. code-block:: - set PYTHON=C:\Python35\bin + set PYTHON=C:\Python38\bin cd /D C:\Pillow\winbuild C:\Python37\bin\python.exe build_prepare.py -v --depends=C:\pillow-depends build\build_dep_all.cmd diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 553ed6365..c17c3e43e 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -456,7 +456,7 @@ def build_pillow(): cmd_cd("{pillow_dir}"), *prefs["header"], cmd_set("DISTUTILS_USE_SDK", "1"), # use same compiler to build Pillow - cmd_set("MSSdk", "1"), # for Python 3.5 and PyPy3.6 + cmd_set("MSSdk", "1"), # for PyPy3.6 cmd_set("py_vcruntime_redist", "true"), # use /MD, not /MT r'"{python_dir}\{python_exe}" setup.py build_ext %*', ]