Upgrade and run pre-commit

wendlers · Jan 27, 2021 · 0c8c136 · 0c8c136
1 parent a247d0f
commit 0c8c136
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 39 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,14  1,15 @@
 repos:
--   repo: https://github.com/ambv/black
-    rev: 18.9b0
-    hooks:
-    - id: black
--   repo: git://github.com/doublify/pre-commit-isort
-    rev: v4.3.0
-    hooks:
-    -   id: isort
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
-    hooks:
-    - id: flake8
-      additional_dependencies: [flake8~=3.6.0]
 - repo: https://github.com/ambv/black
   rev: 20.8b1
   hooks:
   - id: black
 - repo: https://github.com/asottile/reorder_python_imports
   rev: v2.3.5
   hooks:
   -   id: reorder-python-imports
 - repo: https://gitlab.com/pycqa/flake8
   rev: '3.8.4'
   hooks:
   - id: flake8
     args: ["--config=setup.cfg"]
     language_version: python3
diff --git a/mp/conserial.py b/mp/conserial.py
@@ -21,13  21,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
 import logging
 import time
 
-from mp.conbase import ConBase, ConError
 from serial import Serial
 
 from mp.conbase import ConBase
 from mp.conbase import ConError
 
 
 class ConSerial(ConBase):
     def __init__(self, port, baudrate=115200, reset=False):

diff --git a/mp/contelnet.py b/mp/contelnet.py
@@ -21,14  21,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
-
 import sys
 import telnetlib
 import time
 from collections import deque
 
-from mp.conbase import ConBase, ConError
 from mp.conbase import ConBase
 from mp.conbase import ConError
 
 
 class ConTelnet(ConBase):

diff --git a/mp/conwebsock.py b/mp/conwebsock.py
@@ -21,15  21,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
-
 import logging
 import threading
 import time
 from collections import deque
 
 import websocket
-from mp.conbase import ConBase, ConError
 
 from mp.conbase import ConBase
 from mp.conbase import ConError
 
 
 class ConWebsock(ConBase, threading.Thread):

diff --git a/mp/mpfexp.py b/mp/mpfexp.py
@@ -21,8  21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
-
 import ast
 import binascii
 import getpass
@@ -37,7  35,8 @@
 from mp.conserial import ConSerial
 from mp.contelnet import ConTelnet
 from mp.conwebsock import ConWebsock
-from mp.pyboard import Pyboard, PyboardError
 from mp.pyboard import Pyboard
 from mp.pyboard import PyboardError
 from mp.retry import retry
 
 

diff --git a/mp/mpfshell.py b/mp/mpfshell.py
@@ -21,8  21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
-
 import argparse
 import cmd
 import glob
@@ -35,9  33,12 @@
 
 import colorama
 import serial
 
 from mp import version
 from mp.conbase import ConError
-from mp.mpfexp import MpFileExplorer, MpFileExplorerCaching, RemoteIOError
 from mp.mpfexp import MpFileExplorer
 from mp.mpfexp import MpFileExplorerCaching
 from mp.mpfexp import RemoteIOError
 from mp.pyboard import PyboardError
 from mp.tokenizer import Tokenizer
 
@@ -258,8  259,8 @@ def do_ls(self, args):
 
     def do_pwd(self, args):
         """pwd
-         Print current remote directory.
-         """
         Print current remote directory.
         """
         if self.__is_open():
             print(self.fe.pwd())
 

diff --git a/mp/pyboard.py b/mp/pyboard.py
@@ -1,9  1,7 @@
 #!/usr/bin/env python
-
 """
 Pyboard REPL interface
 """
-
 import sys
 import time
 

diff --git a/mp/term.py b/mp/term.py
@@ -21,8  21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
-
 import serial
 
 if serial.VERSION.startswith("2."):

diff --git a/mp/tokenizer.py b/mp/tokenizer.py
@@ -21,7  21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
 import re
 
 

diff --git a/tests/modules/test_tokenizer.py b/tests/modules/test_tokenizer.py
@@ -1,4  1,5 @@
-from mp.tokenizer import Token, Tokenizer
 from mp.tokenizer import Token
 from mp.tokenizer import Tokenizer
 
 
 class TestTokenizer:

diff --git a/tests/ontarget/conftest.py b/tests/ontarget/conftest.py
@@ -21,12  21,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
 # enable logging of modules under test
 import logging
 
 import pytest
-from mp.mpfexp import MpFileExplorer, MpFileExplorerCaching
 
 from mp.mpfexp import MpFileExplorer
 from mp.mpfexp import MpFileExplorerCaching
 
 _mpfexp_inst = None
 

diff --git a/tests/ontarget/test_mpfexp.py b/tests/ontarget/test_mpfexp.py
@@ -21,11  21,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 ##
-
-
 import os
 
 import pytest
 
 from mp.mpfshell import RemoteIOError
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 21,6 @@ @@
     # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     # THE SOFTWARE.
     ##
     import re
@@ Expand Down @@