From: Melissa LeBlanc-Williams Date: Mon, 18 Sep 2023 16:45:00 +0000 (-0700) Subject: Updated requirements and pre-commit repo versions X-Git-Tag: 0.11.1^2 X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/5883df0af5688142a0d054c3276cb84683a08d69 Updated requirements and pre-commit repo versions --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cb4fa5c..ab37f67 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,21 +4,21 @@ repos: - repo: https://github.com/python/black - rev: 22.3.0 + rev: 23.3.0 hooks: - id: black - repo: https://github.com/fsfe/reuse-tool - rev: v0.14.0 + rev: v1.1.2 hooks: - id: reuse - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.4.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/pycqa/pylint - rev: v2.15.5 + rev: v2.17.4 hooks: - id: pylint name: pylint (library code) diff --git a/displayio/_bitmap.py b/displayio/_bitmap.py index b0e3655..c61de47 100644 --- a/displayio/_bitmap.py +++ b/displayio/_bitmap.py @@ -154,7 +154,6 @@ class Bitmap: if (self.width > x_placement >= 0) and ( self.height > y_placement >= 0 ): # ensure placement is within target bitmap - # get the palette index from the source bitmap this_pixel_color = source_bitmap[ y1 diff --git a/displayio/_tilegrid.py b/displayio/_tilegrid.py index 316543d..41ff504 100644 --- a/displayio/_tilegrid.py +++ b/displayio/_tilegrid.py @@ -399,7 +399,6 @@ class TileGrid: @bitmap.setter def bitmap(self, new_bitmap: Union[Bitmap, OnDiskBitmap, Shape]) -> None: - if ( not isinstance(new_bitmap, Bitmap) and not isinstance(new_bitmap, OnDiskBitmap) diff --git a/requirements.txt b/requirements.txt index 0324ea8..c42ccf2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,5 @@ Adafruit-Blinka>=7.0.0 adafruit-circuitpython-typing -pillow -pillow>=6.0.0; python_version>'3.9' +pillow>=9.2.0 numpy diff --git a/setup.py b/setup.py index 2e48252..0f52857 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ requirements = [ ] if sys.version_info > (3, 9): - requirements.append("pillow>=6.0.0") + requirements.append("pillow>=9.2.0") # Get the long description from the README file with open(path.join(here, "README.rst"), encoding="utf-8") as f: