From ef1c69aa2cebaf850ddfdcdc891e6498e2665899 Mon Sep 17 00:00:00 2001 From: Josh Klar Date: Wed, 24 Jul 2019 23:43:00 -0700 Subject: [PATCH] Fix linting; move kmk.util.intify_coordinate to kmk.matrix.intify_coordinate (trying to deprecate/remove util) --- Makefile | 1 - Pipfile | 1 + Pipfile.lock | 9 ++++++++- kmk/boards/converter/keebio/iris_r2.py | 2 +- kmk/boards/klarank.py | 2 +- kmk/internal_state.py | 2 +- kmk/keyboard_config.py | 3 ++- kmk/matrix.py | 4 ++++ kmk/util.py | 4 ---- setup.cfg | 14 +++++++++++--- user_keymaps/kdb424/gherkin.py | 3 +-- user_keymaps/kdb424/klanck.py | 3 +-- 12 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 494e84c..50da5db 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,6 @@ docker-base-deploy: docker-base devdeps: .devdeps lint: devdeps - @$(PIPENV) run black --check @$(PIPENV) run flake8 fix-formatting: devdeps diff --git a/Pipfile b/Pipfile index a8579ee..6dddf33 100644 --- a/Pipfile +++ b/Pipfile @@ -20,6 +20,7 @@ neovim = "*" s3cmd = "*" black = "==19.3b0" flake8-quotes = "*" +flake8-black = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index ddcad6c..c63b1df 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "019b67ce05e7e68766ba54ddbfd3e2faf5dd81c7ded79f80ff3ef85b0017c99d" + "sha256": "e2a8058d3c40039167ababbfee7347b3b61cb679c65b7f98c2b56ba91fafa0dd" }, "pipfile-spec": 6, "requires": { @@ -76,6 +76,13 @@ "index": "pypi", "version": "==3.6.0" }, + "flake8-black": { + "hashes": [ + "sha256:6b5fe2a609fa750170da8d5b1ed7c11029bceaff025660be7f19307ec6fa0c35" + ], + "index": "pypi", + "version": "==0.1.0" + }, "flake8-commas": { "hashes": [ "sha256:d3005899466f51380387df7151fb59afec666a0f4f4a2c6a8995b975de0f44b7", diff --git a/kmk/boards/converter/keebio/iris_r2.py b/kmk/boards/converter/keebio/iris_r2.py index 1646588..582963f 100644 --- a/kmk/boards/converter/keebio/iris_r2.py +++ b/kmk/boards/converter/keebio/iris_r2.py @@ -1,9 +1,9 @@ import board from kmk.consts import DiodeOrientation +from kmk.matrix import intify_coordinate as ic from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig from kmk.pins import Pin as P -from kmk.util import intify_coordinate as ic class KeyboardConfig(_KeyboardConfig): diff --git a/kmk/boards/klarank.py b/kmk/boards/klarank.py index db3f397..9f73690 100644 --- a/kmk/boards/klarank.py +++ b/kmk/boards/klarank.py @@ -1,7 +1,7 @@ from kmk.consts import DiodeOrientation +from kmk.matrix import intify_coordinate as ic from kmk.mcus.circuitpython_usbhid import KeyboardConfig as _KeyboardConfig from kmk.pins import Pin as P -from kmk.util import intify_coordinate as ic # Implements what used to be handled by KeyboardConfig.swap_indicies for this # board, by flipping various row3 (bottom physical row) keys so their diff --git a/kmk/internal_state.py b/kmk/internal_state.py index c149589..3707ca0 100644 --- a/kmk/internal_state.py +++ b/kmk/internal_state.py @@ -1,8 +1,8 @@ from kmk.consts import LeaderMode from kmk.keys import KC from kmk.kmktime import ticks_ms +from kmk.matrix import intify_coordinate from kmk.types import TapDanceKeyMeta -from kmk.util import intify_coordinate class InternalState: diff --git a/kmk/keyboard_config.py b/kmk/keyboard_config.py index 5b64f15..4a78827 100644 --- a/kmk/keyboard_config.py +++ b/kmk/keyboard_config.py @@ -49,7 +49,8 @@ import kmk.internal_state # isort:skip # Thanks for sticking around. Now let's do real work, starting below from kmk.kmktime import sleep_ms -from kmk.util import intify_coordinate as ic +from kmk.matrix import intify_coordinate as ic + from kmk import led, rgb # isort:skip diff --git a/kmk/matrix.py b/kmk/matrix.py index 81806ec..480ffec 100644 --- a/kmk/matrix.py +++ b/kmk/matrix.py @@ -3,6 +3,10 @@ import digitalio from kmk.consts import DiodeOrientation +def intify_coordinate(row, col): + return row << 8 | col + + class MatrixScanner: def __init__( self, diff --git a/kmk/util.py b/kmk/util.py index 9d450a9..124ecb5 100644 --- a/kmk/util.py +++ b/kmk/util.py @@ -1,7 +1,3 @@ -def intify_coordinate(row, col): - return row << 8 | col - - def get_wide_ordinal(char): if len(char) != 2: return ord(char) diff --git a/setup.cfg b/setup.cfg index d4d6f77..c7656a0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,14 +4,22 @@ exclude = .git,__pycache__,vendor,.venv,build max_line_length = 88 # enforce single quotes -select = Q0 docstring-quotes = ''' multiline-quotes = ''' -ignore = X100, E262 +extend-ignore = + X100, E262, + # See https://github.com/PyCQA/pycodestyle/issues/373 + E203, + # comply with black + # it will handle line lengths automatically + E501, + # it also controls trailing commas in general + C812, C813, C815, + per-file-ignores = # Allow crazy line lengths, unused variables, and multiple spaces after commas in lists (for grid alignment) - user_keymaps/**/*.py: F401,E501,E241,E131 + user_keymaps/**/*.py: F401,E501,E241,E131,BLK100 tests/test_data/keymaps/**/*.py: F401,E501 # Forgive me for my RAM hack sins kmk/keyboard_config.py: I001,I003,I004,F401 diff --git a/user_keymaps/kdb424/gherkin.py b/user_keymaps/kdb424/gherkin.py index 1d55b55..bcb3c08 100644 --- a/user_keymaps/kdb424/gherkin.py +++ b/user_keymaps/kdb424/gherkin.py @@ -1,6 +1,5 @@ from kmk.consts import DiodeOrientation, UnicodeMode -from kmk.handlers.sequences import (compile_unicode_string_sequences, - send_string) +from kmk.handlers.sequences import compile_unicode_string_sequences, send_string from kmk.keys import KC from kmk.mcus.circuitpython_usbhid import KeyboardConfig from kmk.pins import Pin as P diff --git a/user_keymaps/kdb424/klanck.py b/user_keymaps/kdb424/klanck.py index 9bf8b7f..a650206 100644 --- a/user_keymaps/kdb424/klanck.py +++ b/user_keymaps/kdb424/klanck.py @@ -1,6 +1,5 @@ from kmk.consts import DiodeOrientation, UnicodeMode -from kmk.handlers.sequences import (compile_unicode_string_sequences, - send_string) +from kmk.handlers.sequences import compile_unicode_string_sequences, send_string from kmk.keys import KC from kmk.mcus.circuitpython_usbhid import KeyboardConfig from kmk.pins import Pin as P