uprev test deps and correct import orders (#65)

Author: samuelcolvin

.pyup.yml

@@ -1,5 +1,5 @@
 .DEFAULT_GOAL := all
-isort = isort -rc devtools tests
+isort = isort devtools tests
 black = black -S -l 120 --target-version py37 devtools
 
 .PHONY: install
@@ -16,8 +16,8 @@ format:
 .PHONY: lint
 lint:
 	flake8 devtools/ tests/
-	$(isort) --check-only -df
-	$(black) --check
+	$(isort) --check-only --df
+	$(black) --check --diff
 
 .PHONY: check-dist
 check-dist:

Makefile

@@ -257,8 +257,8 @@ def _parse_code(
         All we're trying to do here is build an AST of the function call statement. However numerous ugly interfaces,
         lack on introspection support and changes between python versions make this extremely hard.
         """
-        from textwrap import dedent
         import ast
+        from textwrap import dedent
 
         def get_code(_last_line: int) -> str:
             lines = file_lines[first_line - 1 : _last_line]

devtools/debug.py

@@ -31,8 +31,8 @@ class SkipPretty(Exception):
 def get_pygments():
     try:
         import pygments
-        from pygments.lexers import PythonLexer
         from pygments.formatters import Terminal256Formatter
+        from pygments.lexers import PythonLexer
     except ImportError:  # pragma: no cover
         return None, None, None
     else:

devtools/prettier.py

@@ -41,10 +41,9 @@ def activate_win_color() -> bool:  # pragma: no cover
 
     Code snippet source: https://bugs.python.org/msg291732
     """
-    import os
-    import msvcrt
     import ctypes
-
+    import msvcrt
+    import os
     from ctypes import wintypes
 
     def _check_bool(result, func, args):

devtools/utils.py

@@ -1,6 +1,5 @@
 [tool:pytest]
 testpaths = tests
-timeout = 10
 filterwarnings = error
 
 [flake8]
@@ -23,8 +22,7 @@ exclude_lines =
 
 [isort]
 line_length=120
-known_first_party=foxglove
-known_standard_library=dataclasses
+known_first_party=devtools
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0

setup.cfg

@@ -1,17 +1,17 @@
 black==19.10b0
-coverage==4.5.3
-flake8==3.7.9
-isort==4.3.17
+coverage==5.2.1
+flake8==3.8.3
+isort==5.2.1
 pycodestyle==2.6.0
 pyflakes==2.2.0
 Pygments==2.6.1
-pydantic==1.5.1
-pytest==5.4.2
-pytest-cov==2.8.1
-pytest-mock==3.1.0
-pytest-sugar==0.9.3
+pydantic==1.6.1
+pytest==5.4.3
+pytest-cov==2.10.0
+pytest-mock==3.2.0
+pytest-sugar==0.9.4
 pytest-toolbox==0.4
-twine==3.1.1
+twine==3.2.0
 asyncpg  # pyup: ignore
 numpy  # pyup: ignore
 multidict  # pyup: ignore