Merge pull request #89 from makermelissa/main

Require Pillow 6 for Python >= 3.10

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 68b37c856c946521c83c52955856351782c749bc..a37eb9436327f883b49d1813bfc260c04f570e61 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 
 repos:
 -   repo: https://github.com/python/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     - id: black
 -   repo: https://github.com/fsfe/reuse-tool

diff --git a/requirements.txt b/requirements.txt
index 054614e09d9f5d9aa13b007d07322888df0685ff..0324ea8bcfa01a8058a09e5d42b70e383926eb3f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,5 @@
 Adafruit-Blinka>=7.0.0
 adafruit-circuitpython-typing
 pillow
+pillow>=6.0.0; python_version>'3.9'
 numpy

diff --git a/setup.py b/setup.py
index 2d4a2333378c9ca32650c5e24f4165386aabfa51..2e48252ed3cddfd794272be564ba3d1d8224c3e7 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -14,9 +14,20 @@ from setuptools import setup, find_packages
 # To use a consistent encoding
 from codecs import open
 from os import path
+import sys
 
 here = path.abspath(path.dirname(__file__))
 
+requirements = [
+    "Adafruit-Blinka>=7.0.0",
+    "adafruit-circuitpython-typing",
+    "pillow",
+    "numpy",
+]
+
+if sys.version_info > (3, 9):
+    requirements.append("pillow>=6.0.0")
+
 # Get the long description from the README file
 with open(path.join(here, "README.rst"), encoding="utf-8") as f:
     long_description = f.read()
@@ -33,12 +44,7 @@ setup(
     # Author details
     author="Adafruit Industries",
     author_email="circuitpython@adafruit.com",
-    install_requires=[
-        "Adafruit-Blinka>=7.0.0",
-        "adafruit-circuitpython-typing",
-        "pillow",
-        "numpy",
-    ],
+    install_requires=requirements,
     # Choose your license
     license="MIT",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers