Add pre-commit hook and improve its rules

magmax · magmax · commit 12c2128bef80 · 2022-02-04T07:15:28.000+01:00
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -0,0 +1,14 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - uses: pre-commit/action@v2.0.3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -16,12 +16,12 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - "2.7"
         - "3.5"
         - "3.6"
         - "3.7"
         - "3.8"
         - "3.9"
+        - "3.10"
 
     steps:
     - uses: actions/checkout@v2
@@ -33,8 +33,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install -r requirements-test.txt
-    - name: Lint with flake8
-      run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,17 +1,24 @@
 repos:
-  - repo: https://github.com/PyCQA/isort.git
-    rev: 5.7.0
-    hooks:
-    - id: isort
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.1.0
+    hooks:
+      - name: re-format with black
+        id: black
+        language_version: python3
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
     hooks:
-    - id: black
-      language_version: python3
-      args:
-        - -l
-        - "119"
+      - name: remove whitespaces
+        id: trailing-whitespace
+
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 6de8252c035844f1e679f509b5f37340b44d5c39
+    rev: 21d3c70d676007470908d39b73f0521d39b3b997
     hooks:
-    - id: flake8
+      - name: check-format with flake8
+        id: flake8
+        args:
+          - --show-source
+          - --statistics
+          - --count
+          - --max-complexity=12
diff --git a/readchar/key.py b/readchar/key.py
@@ -8,32 +8,32 @@
 ESC = "\x1b"
 
 # CTRL
-CTRL_A = '\x01'
-CTRL_B = '\x02'
-CTRL_C = '\x03'
-CTRL_D = '\x04'
-CTRL_E = '\x05'
-CTRL_F = '\x06'
-CTRL_G = '\x07'
-CTRL_H = '\x08'
-CTRL_I = '\t'
-CTRL_J = '\n'
-CTRL_K = '\x0b'
-CTRL_L = '\x0c'
-CTRL_M = '\r'
-CTRL_N = '\x0e'
-CTRL_O = '\x0f'
-CTRL_P = '\x10'
-CTRL_Q = '\x11'
-CTRL_R = '\x12'
-CTRL_S = '\x13'
-CTRL_T = '\x14'
-CTRL_U = '\x15'
-CTRL_V = '\x16'
-CTRL_W = '\x17'
-CTRL_X = '\x18'
-CTRL_Y = '\x19'
-CTRL_Z = '\x1a'
+CTRL_A = "\x01"
+CTRL_B = "\x02"
+CTRL_C = "\x03"
+CTRL_D = "\x04"
+CTRL_E = "\x05"
+CTRL_F = "\x06"
+CTRL_G = "\x07"
+CTRL_H = "\x08"
+CTRL_I = "\t"
+CTRL_J = "\n"
+CTRL_K = "\x0b"
+CTRL_L = "\x0c"
+CTRL_M = "\r"
+CTRL_N = "\x0e"
+CTRL_O = "\x0f"
+CTRL_P = "\x10"
+CTRL_Q = "\x11"
+CTRL_R = "\x12"
+CTRL_S = "\x13"
+CTRL_T = "\x14"
+CTRL_U = "\x15"
+CTRL_V = "\x16"
+CTRL_W = "\x17"
+CTRL_X = "\x18"
+CTRL_Y = "\x19"
+CTRL_Z = "\x1a"
 
 # ALT
 ALT_A = "\x1b\x61"
diff --git a/readchar/readchar.py b/readchar/readchar.py
@@ -53,10 +53,10 @@
         20960: key.PAGE_DOWN,
         18400: key.HOME,
         20448: key.END,
-        18432: key.UP,      # 72 * 256
-        20480: key.DOWN,    # 80 * 256
-        19200: key.LEFT,    # 75 * 256
-        19712: key.RIGHT,   # 77 * 256
+        18432: key.UP,  # 72 * 256
+        20480: key.DOWN,  # 80 * 256
+        19200: key.LEFT,  # 75 * 256
+        19712: key.RIGHT,  # 77 * 256
     }
 
     def readkey(getchar_fn=None):
@@ -79,7 +79,6 @@ def readkey(getchar_fn=None):
                 else:
                     return ch.decode()
 
-
 else:
 
     def readkey(getchar_fn=None):
