Drop support for Python 3.6 (#63)

Author: bigcat88

.github/workflows/publish-pypi-pi_heif.yml

@@ -43,7 +43,7 @@ jobs:
           python3 -m pip install cibuildwheel
           python3 -m cibuildwheel
         env:
-          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-*"
+          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-*"
           CIBW_ARCHS_WINDOWS: "AMD64"
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -vv -w {dest_dir} {wheel} --add-path ${{ env.MSYS2_PREFIX }}/bin"
           CIBW_ENVIRONMENT_WINDOWS: PH_LIGHT_ACTION=1
@@ -78,8 +78,6 @@ jobs:
           python3 -m cibuildwheel
         env:
           CIBW_BUILD: "*-macosx_x86_64"
-          CIBW_SKIP: "cp36-* pp39-*"
-          CIBW_TEST_SKIP: "cp311-*"
           CIBW_ENVIRONMENT_MACOS: PH_LIGHT_ACTION=1 TEST_DECODE_THREADS=0
 
       - name: Checking built wheels
@@ -204,7 +202,7 @@ jobs:
           if-no-files-found: error
 
   wheels_armv7l:
-    name: ${{ matrix.i['name'] }} • ARMv7l • CPython3.7+
+    name: ${{ matrix.i['name'] }} • ARMv7l • CPython
     runs-on: ubuntu-20.04
     strategy:
       matrix:

.github/workflows/publish-pypi.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   wheels_armv7l:
-    name: ${{ matrix.i['name'] }} • ARMv7l • CPython3.7+
+    name: ${{ matrix.i['name'] }} • ARMv7l • CPython
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -75,7 +75,7 @@ jobs:
           python3 -m pip install cibuildwheel
           python3 -m cibuildwheel
         env:
-          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-*"
+          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-*"
           CIBW_ARCHS_WINDOWS: "AMD64"
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -vv -w {dest_dir} {wheel} --add-path ${{ env.MSYS2_PREFIX }}/bin"
           CIBW_ENVIRONMENT_WINDOWS: PH_FULL_ACTION=1
@@ -104,8 +104,6 @@ jobs:
           python3 -m cibuildwheel
         env:
           CIBW_BUILD: "*-macosx_x86_64"
-          CIBW_SKIP: "cp36-* pp39-*"
-          CIBW_TEST_SKIP: "cp311-*"
           CIBW_ENVIRONMENT_MACOS: PH_FULL_ACTION=1 TEST_DECODE_THREADS=0
 
       - name: Check built wheels

.github/workflows/test-wheels-pi_heif.yml

@@ -22,8 +22,6 @@ jobs:
           { "os": "oraclelinux", "ver": "8", "arch": "arm64" },
           { "os": "fedora", "ver": "35", "arch": "amd64" },
           { "os": "fedora", "ver": "37", "arch": "amd64" },
-          { "os": "centos", "ver": "7", "arch": "amd64" },
-          { "os": "centos", "ver": "7", "arch": "arm64" },
           { "os": "debian", "ver": "10", "arch": "amd64" },
           { "os": "debian", "ver": "10", "arch": "arm64" },
           { "os": "debian", "ver": "10", "arch": "arm/v7" },
@@ -148,7 +146,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["pypy-3.7", "pypy-3.8", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["pypy-3.7", "pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - name: Delay, waiting Pypi to update.

.github/workflows/test-wheels.yml

@@ -22,8 +22,6 @@ jobs:
           { "os": "oraclelinux", "ver": "8", "arch": "arm64" },
           { "os": "fedora", "ver": "35", "arch": "amd64" },
           { "os": "fedora", "ver": "37", "arch": "amd64" },
-          { "os": "centos", "ver": "7", "arch": "amd64" },
-          { "os": "centos", "ver": "7", "arch": "arm64" },
           { "os": "debian", "ver": "10", "arch": "amd64" },
           { "os": "debian", "ver": "10", "arch": "arm64" },
           { "os": "debian", "ver": "10", "arch": "arm/v7" },
@@ -152,7 +150,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["pypy-3.7", "pypy-3.8", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["pypy-3.7", "pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - name: Delay, waiting Pypi to update.

CHANGELOG.md

@@ -2,6 +2,16 @@ _# Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.1 - 202x-xx-xx]
+
+### Added
+
+### Changed
+
+- Drop support for Python 3.6
+
+### Fixed
+
 ## [0.9.0 - 2022-12-15]
 
 ### Added

README.md

@@ -175,7 +175,6 @@ pillow_heif.register_avif_opener()
 
 | **_Wheels table_** | macOS<br/>Intel | macOS<br/>Silicon | Windows<br/>64bit | musllinux* | manylinux* |
 |--------------------|:---------------:|:-----------------:|:-----------------:|:----------:|:----------:|
-| CPython 3.6        |       N/A       |        N/A        |        N/A        |     ✅      |     ✅      |
 | CPython 3.7        |        ✅        |        N/A        |         ✅         |     ✅      |     ✅      |
 | CPython 3.8        |        ✅        |         ✅         |         ✅         |     ✅      |     ✅      |
 | CPython 3.9        |        ✅        |         ✅         |         ✅         |     ✅      |     ✅      |

pillow_heif/private.py

@@ -2,6 +2,7 @@
 Undocumented private functions to make other code look better.
 """
 
+from dataclasses import dataclass
 from math import ceil
 from typing import Union
 
@@ -15,9 +16,8 @@
 FFI_DRY_ALLOC = ffi.new_allocator(should_clear_after_alloc=False)
 
 
-# from dataclasses import dataclass
-# @dataclass                # Available from Python 3.7
-class HeifCtxAsDict:  # noqa # pylint: disable=too-few-public-methods
+@dataclass
+class HeifCtxAsDict:
     """Representation of one image"""
 
     def __init__(self, mode: str, size: tuple, data, **kwargs):
@@ -31,7 +31,7 @@ def __init__(self, mode: str, size: tuple, data, **kwargs):
         self.additional_info = kwargs.get("add_info", {})
 
 
-def get_pure_stride(mode: str, width: int):
+def get_pure_stride(mode: str, width: int) -> int:
     return width * MODE_INFO[mode][0] * ceil(MODE_INFO[mode][1] / 8)
 
 

pyproject.toml

@@ -61,6 +61,7 @@ filterwarnings = [
 
 [tool.cibuildwheel]
 build-verbosity = "2"
+skip = ["cp36-*", "pp39-*"]
 
 [tool.cibuildwheel.linux]
 test-extras = "tests"

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pillow_heif
-description = Python 3.6+ interface to libheif library
+description = Python interface for libheif library
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/bigcat88/pillow_heif
@@ -15,7 +15,6 @@ classifiers =
     Topic :: Multimedia :: Graphics
     Topic :: Multimedia :: Graphics :: Graphics Conversion
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -34,7 +33,7 @@ project_urls =
     Changelog=https://github.com/bigcat88/pillow_heif/blob/master/CHANGELOG.md
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 zip_safe = False
 packages = find:
 install_requires =

setup.py

@@ -8,14 +8,10 @@ class WheelsABI3(bdist_wheel):
     def get_tag(self):
         python, abi, plat = super().get_tag()
         if python.startswith("cp"):
-            python = "cp36"
+            python = "cp37"
             abi = "abi3"
-            if plat.startswith("macosx"):
-                python = "cp37" if plat.find("x86_64") != -1 else "cp38"
-            elif plat.startswith("win"):
-                python = "cp37"
-            elif plat == "linux_armv7l":
-                python = "cp37"
+            if plat.startswith("macosx") and plat.find("x86_64") == -1:
+                python = "cp38"
         return python, abi, plat