From ef5c46eba5b4e7101f0dffc5a7d4e34a566d94fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 9 Mar 2018 16:29:30 +0100 Subject: [PATCH] Some mypy & test tweaks --- blender_asset_tracer/pack/queued_copy.py | 6 +++--- setup.cfg | 2 ++ tests/test_pack.py | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blender_asset_tracer/pack/queued_copy.py b/blender_asset_tracer/pack/queued_copy.py index 45428d5..b3b0914 100644 --- a/blender_asset_tracer/pack/queued_copy.py +++ b/blender_asset_tracer/pack/queued_copy.py @@ -10,7 +10,7 @@ log = logging.getLogger(__name__) class FileCopier(threading.Thread, transfer.FileTransferer): """Copies or moves files in source directory order.""" - def __init__(self): + def __init__(self) -> None: # Stupid Thread.__init__ doesn't call super().__init__(), # so it doesn't get chained to transfer.FileTransferer.__init__(). # However, I want to have Thread as first subclass so that its @@ -18,7 +18,7 @@ class FileCopier(threading.Thread, transfer.FileTransferer): threading.Thread.__init__(self) transfer.FileTransferer.__init__(self) - def run(self): + def run(self) -> None: files_transferred = 0 files_skipped = 0 @@ -52,7 +52,7 @@ class FileCopier(threading.Thread, transfer.FileTransferer): # TODO(Sybren): when we target Py 3.6+, remove the str() calls. tfunc = transfer_funcs[act] - tfunc(str(src), str(dst)) + tfunc(str(src), str(dst)) # type: ignore files_transferred += 1 except Exception: diff --git a/setup.cfg b/setup.cfg index b3c7796..bd60dc5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,3 +9,5 @@ max-line-length = 100 python_version = 3.5 warn_redundant_casts = True +ignore_missing_imports = True +incremental = True diff --git a/tests/test_pack.py b/tests/test_pack.py index 219be97..92a4c4f 100644 --- a/tests/test_pack.py +++ b/tests/test_pack.py @@ -35,6 +35,8 @@ class AbstractPackTest(AbstractBlendFileTest): for path, action in packer._actions.items() if action.rewrites} + +class PackTest(AbstractPackTest): def test_strategise_no_rewrite_required(self): infile = self.blendfiles / 'doubly_linked.blend'