From 19bdd15c4c00d47193f87bef1e60212d269b3914 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 2 Mar 2021 18:23:26 -0600 Subject: [PATCH 1/3] pylint to precommit --- .github/workflows/build.yml | 4 ---- .pre-commit-config.yaml | 15 +++++++++++++++ .pylintrc | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17b6e2f..0434bc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,10 +50,6 @@ jobs: - name: Pre-commit hooks run: | pre-commit run --all-files - - name: PyLint - run: | - pylint $( find . -path './adafruit*.py' ) - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace $( find . -path "./examples/*.py" )) - name: Build assets run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . - name: Build docs diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40eae91..ca50c20 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,4 +17,19 @@ repos: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace +- repo: https://github.com/pycqa/pylint + rev: pylint-2.7.1 + hooks: + - id: pylint + name: pylint (library code) + types: [python] + exclude: "^(docs/|examples/|setup.py$)" +- repo: local + hooks: + - id: pylint_examples + name: pylint (examples code) + description: Run pylint rules on "examples/*.py" files + entry: /usr/bin/env bash -c + args: ['([[ ! -d "examples" ]] || for example in $(find . -path "./examples/*.py"); do pylint --disable=missing-docstring,invalid-name $example; done)'] + language: system exclude: \.png$ diff --git a/.pylintrc b/.pylintrc index 54a9d35..3c07cc6 100644 --- a/.pylintrc +++ b/.pylintrc @@ -250,7 +250,7 @@ ignore-comments=yes ignore-docstrings=yes # Ignore imports when computing similarities. -ignore-imports=no +ignore-imports=yes # Minimum lines number of a similarity. min-similarity-lines=4 From 647310620cf58b55a9dd6dd0631c16443af0fe93 Mon Sep 17 00:00:00 2001 From: Dylan Herrada <33632497+dherrada@users.noreply.github.com> Date: Wed, 3 Mar 2021 16:39:36 -0500 Subject: [PATCH 2/3] Corrected black and reuse version --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ca50c20..af17016 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,11 +4,11 @@ repos: - repo: https://github.com/python/black - rev: 19.10b0 + rev: 20.8b1 hooks: - id: black - repo: https://github.com/fsfe/reuse-tool - rev: 20.8b1 + rev: v0.12.1 hooks: - id: reuse - repo: https://github.com/pre-commit/pre-commit-hooks From e0e58e8e8d1de9e5b9e08bef6a7e5112778da860 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 8 Mar 2021 12:00:54 -0600 Subject: [PATCH 3/3] black code format --- examples/pixel_framebuf_16x16_animation.py | 12 ++++++++++-- examples/pixel_framebuf_32x8_test.py | 5 ++++- examples/pixel_framebuf_dotstar_simpletest.py | 13 +++++++++++-- examples/pixel_framebuf_pillow_image.py | 12 ++++++++++-- examples/pixel_framebuf_simpletest.py | 12 ++++++++++-- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/examples/pixel_framebuf_16x16_animation.py b/examples/pixel_framebuf_16x16_animation.py index 35a2bd1..cf66547 100755 --- a/examples/pixel_framebuf_16x16_animation.py +++ b/examples/pixel_framebuf_16x16_animation.py @@ -9,10 +9,18 @@ pixel_height = 16 pixels = neopixel.NeoPixel( - pixel_pin, pixel_width * pixel_height, brightness=0.1, auto_write=False, + pixel_pin, + pixel_width * pixel_height, + brightness=0.1, + auto_write=False, ) -pixel_framebuf = PixelFramebuffer(pixels, pixel_width, pixel_height, reverse_x=True,) +pixel_framebuf = PixelFramebuffer( + pixels, + pixel_width, + pixel_height, + reverse_x=True, +) text = "Welcome to CircuitPython" diff --git a/examples/pixel_framebuf_32x8_test.py b/examples/pixel_framebuf_32x8_test.py index ddc68d8..b741934 100755 --- a/examples/pixel_framebuf_32x8_test.py +++ b/examples/pixel_framebuf_32x8_test.py @@ -9,7 +9,10 @@ pixel_height = 8 pixels = neopixel.NeoPixel( - pixel_pin, pixel_width * pixel_height, brightness=0.1, auto_write=False, + pixel_pin, + pixel_width * pixel_height, + brightness=0.1, + auto_write=False, ) pixel_framebuf = PixelFramebuffer( diff --git a/examples/pixel_framebuf_dotstar_simpletest.py b/examples/pixel_framebuf_dotstar_simpletest.py index bfa01d6..ebc198b 100644 --- a/examples/pixel_framebuf_dotstar_simpletest.py +++ b/examples/pixel_framebuf_dotstar_simpletest.py @@ -12,10 +12,19 @@ pixel_height = 6 pixels = adafruit_dotstar.DotStar( - board.D13, board.D11, pixel_width * pixel_height, brightness=0.3, auto_write=False, + board.D13, + board.D11, + pixel_width * pixel_height, + brightness=0.3, + auto_write=False, ) -pixel_framebuf = PixelFramebuffer(pixels, pixel_width, pixel_height, alternating=False,) +pixel_framebuf = PixelFramebuffer( + pixels, + pixel_width, + pixel_height, + alternating=False, +) pixel_framebuf.fill(0x000088) pixel_framebuf.pixel(5, 1, 0xFFFF00) diff --git a/examples/pixel_framebuf_pillow_image.py b/examples/pixel_framebuf_pillow_image.py index 155d43c..60d17b0 100644 --- a/examples/pixel_framebuf_pillow_image.py +++ b/examples/pixel_framebuf_pillow_image.py @@ -19,10 +19,18 @@ pixel_height = 16 pixels = neopixel.NeoPixel( - pixel_pin, pixel_width * pixel_height, brightness=0.1, auto_write=False, + pixel_pin, + pixel_width * pixel_height, + brightness=0.1, + auto_write=False, ) -pixel_framebuf = PixelFramebuffer(pixels, pixel_width, pixel_height, reverse_x=True,) +pixel_framebuf = PixelFramebuffer( + pixels, + pixel_width, + pixel_height, + reverse_x=True, +) # Make a black background in RGBA Mode image = Image.new("RGBA", (pixel_width, pixel_height)) diff --git a/examples/pixel_framebuf_simpletest.py b/examples/pixel_framebuf_simpletest.py index cacffad..4c916c6 100644 --- a/examples/pixel_framebuf_simpletest.py +++ b/examples/pixel_framebuf_simpletest.py @@ -12,10 +12,18 @@ pixel_height = 4 pixels = neopixel.NeoPixel( - pixel_pin, pixel_width * pixel_height, brightness=0.1, auto_write=False, + pixel_pin, + pixel_width * pixel_height, + brightness=0.1, + auto_write=False, ) -pixel_framebuf = PixelFramebuffer(pixels, pixel_width, pixel_height, alternating=False,) +pixel_framebuf = PixelFramebuffer( + pixels, + pixel_width, + pixel_height, + alternating=False, +) pixel_framebuf.fill(0x000088) pixel_framebuf.pixel(5, 1, 0xFFFF00)