diff --git a/listdeps b/listdeps index 6ad9869b..43e75b14 100755 --- a/listdeps +++ b/listdeps @@ -81,7 +81,7 @@ PIP_DEPS = { PKG('mox3'), PKG('py-cpuinfo'), PKG('pyfakefs'), - PKG('pylint==1.9.3'), + PKG('pylint==2.2.2'), PKG('mypy==0.610'), PKG('mypy-extensions'), ], diff --git a/noisicaa/audioproc/audioproc_client.py b/noisicaa/audioproc/audioproc_client.py index 862732f8..3b3b7be7 100644 --- a/noisicaa/audioproc/audioproc_client.py +++ b/noisicaa/audioproc/audioproc_client.py @@ -20,7 +20,7 @@ # # @end:license -import asyncio # pylint: disable=unused-import +import asyncio import logging from typing import Any, Dict, Optional, Set, Tuple diff --git a/noisicaa/audioproc/audioproc_process.py b/noisicaa/audioproc/audioproc_process.py index 80383add..cc3bd3f5 100644 --- a/noisicaa/audioproc/audioproc_process.py +++ b/noisicaa/audioproc/audioproc_process.py @@ -24,7 +24,7 @@ import functools import logging import sys import uuid -from typing import cast, Any, Optional, Dict, List, Set, Tuple # pylint: disable=unused-import +from typing import cast, Any, Optional, Dict, List, Set, Tuple import posix_ipc diff --git a/noisicaa/audioproc/engine/graph.py b/noisicaa/audioproc/engine/graph.py index 5d106dc2..10cdac0b 100644 --- a/noisicaa/audioproc/engine/graph.py +++ b/noisicaa/audioproc/engine/graph.py @@ -21,12 +21,12 @@ # @end:license import logging -from typing import Any, Dict, List, Optional, Set # pylint: disable=unused-import +from typing import Any, Dict, List, Optional, Set import toposort from noisicaa import core -from noisicaa.core import ipc # pylint: disable=unused-import +from noisicaa.core import ipc from noisicaa import audioproc from noisicaa import node_db from noisicaa import host_system as host_system_lib diff --git a/noisicaa/audioproc/engine/plugin_host_process.py b/noisicaa/audioproc/engine/plugin_host_process.py index 871e67c1..48cb094c 100644 --- a/noisicaa/audioproc/engine/plugin_host_process.py +++ b/noisicaa/audioproc/engine/plugin_host_process.py @@ -26,7 +26,8 @@ import functools import logging import os import threading -from typing import Any, Dict, Tuple # pylint: disable=unused-import +import typing +from typing import Any, Dict, Tuple import uuid import warnings @@ -50,7 +51,9 @@ from noisicaa import node_db from noisicaa.audioproc.public import plugin_state_pb2 from . import plugin_host_pb2 from . import plugin_host -from . import plugin_ui_host # pylint: disable=unused-import + +if typing.TYPE_CHECKING: + from . import plugin_ui_host logger = logging.getLogger(__name__) diff --git a/noisicaa/core/callbacks.py b/noisicaa/core/callbacks.py index ab1a72be..39af149e 100644 --- a/noisicaa/core/callbacks.py +++ b/noisicaa/core/callbacks.py @@ -24,7 +24,7 @@ import collections import logging import random import threading -from typing import Any, Dict, Callable, List, Optional, Generic, TypeVar # pylint: disable=unused-import +from typing import Any, Dict, Callable, Generic, TypeVar logger = logging.getLogger(__name__) diff --git a/noisicaa/core/ipc.py b/noisicaa/core/ipc.py index 9312243f..0153160e 100644 --- a/noisicaa/core/ipc.py +++ b/noisicaa/core/ipc.py @@ -30,7 +30,7 @@ import pickle import pprint import time import traceback -from typing import cast, Any, Optional, Dict, Callable # pylint: disable=unused-import +from typing import cast, Any, Optional, Dict, Callable import uuid from . import stats diff --git a/noisicaa/core/process_manager.py b/noisicaa/core/process_manager.py index e1878a1c..c1a7afe0 100644 --- a/noisicaa/core/process_manager.py +++ b/noisicaa/core/process_manager.py @@ -29,7 +29,6 @@ import importlib import logging import os import pickle -import resource # pylint: disable=unused-import import select import shutil import signal @@ -39,9 +38,8 @@ import tempfile import threading import time import traceback -from typing import ( # pylint: disable=unused-import - cast, Any, Optional, Callable, Iterator, Dict, List, Set, Tuple -) +import typing +from typing import cast, Any, Optional, Callable, Iterator, Dict, List, Set, Tuple import eventfd @@ -50,6 +48,9 @@ from . import stats from . import stacktrace from .logging import init_pylogging +if typing.TYPE_CHECKING: + import resource + logger = logging.getLogger(__name__) diff --git a/noisicaa/core/sessions.py b/noisicaa/core/sessions.py index a482d7c3..d95403a4 100644 --- a/noisicaa/core/sessions.py +++ b/noisicaa/core/sessions.py @@ -24,7 +24,7 @@ import asyncio import functools import io import logging -from typing import Any, List, Dict, Type # pylint: disable=unused-import +from typing import Any, List, Dict, Type import uuid from . import ipc diff --git a/noisicaa/core/stats/registry.py b/noisicaa/core/stats/registry.py index 52bc06e9..be5025fe 100644 --- a/noisicaa/core/stats/registry.py +++ b/noisicaa/core/stats/registry.py @@ -23,7 +23,7 @@ import logging import threading import time -from typing import Dict, List, Tuple, Type, TypeVar # pylint: disable=unused-import +from typing import Dict, List, Tuple, Type, TypeVar import psutil diff --git a/noisicaa/core/stats/timeseries.py b/noisicaa/core/stats/timeseries.py index ffabb559..3d2d4b8f 100644 --- a/noisicaa/core/stats/timeseries.py +++ b/noisicaa/core/stats/timeseries.py @@ -22,7 +22,7 @@ import collections import logging -from typing import List, MutableMapping, MutableSequence, Union # pylint: disable=unused-import +from typing import List, MutableMapping, MutableSequence, Union from . import stats diff --git a/noisicaa/core/storage.py b/noisicaa/core/storage.py index 71a3bc1c..5f8aec1b 100644 --- a/noisicaa/core/storage.py +++ b/noisicaa/core/storage.py @@ -30,7 +30,7 @@ import time import struct import queue import threading -from typing import cast, Any, Dict, List, Set, Tuple, IO # pylint: disable=unused-import +from typing import cast, Dict, List, Set, Tuple, IO from mypy_extensions import TypedDict import portalocker diff --git a/noisicaa/debug_console.py b/noisicaa/debug_console.py index 47c8b551..c16e49d4 100644 --- a/noisicaa/debug_console.py +++ b/noisicaa/debug_console.py @@ -27,8 +27,8 @@ import os import signal import textwrap import unicodedata -from typing import ( # pylint: disable=unused-import - Any, Optional, Awaitable, Callable, Iterable, Iterator, Dict, List, Set, Tuple, Union +from typing import ( + Any, Optional, Awaitable, Callable, Iterable, Iterator, Dict, List, Tuple, Union ) import psutil diff --git a/noisicaa/devices/midi_events.py b/noisicaa/devices/midi_events.py index e6acc0c4..2461fded 100644 --- a/noisicaa/devices/midi_events.py +++ b/noisicaa/devices/midi_events.py @@ -20,7 +20,7 @@ # # @end:license -from typing import Any, Dict # pylint: disable=unused-import +from typing import Any class MidiEvent(object): diff --git a/noisicaa/devices/midi_hub.py b/noisicaa/devices/midi_hub.py index 74d96b85..a6b50b83 100644 --- a/noisicaa/devices/midi_hub.py +++ b/noisicaa/devices/midi_hub.py @@ -23,7 +23,7 @@ import logging import select import threading -from typing import Any, Iterator, Callable, Dict, Tuple # pylint: disable=unused-import +from typing import Any, Iterator, Callable, Dict, Tuple from noisicaa import core from . import libalsa diff --git a/noisicaa/devices/midi_hub_test.py b/noisicaa/devices/midi_hub_test.py index 3afef305..66ecd015 100644 --- a/noisicaa/devices/midi_hub_test.py +++ b/noisicaa/devices/midi_hub_test.py @@ -22,7 +22,7 @@ import threading from unittest import mock -from typing import Dict, Iterable # pylint: disable=unused-import +from typing import Dict, Iterable from noisidev import unittest from . import libalsa diff --git a/noisicaa/instr/riff.py b/noisicaa/instr/riff.py index 592627ec..e7e8b6f7 100644 --- a/noisicaa/instr/riff.py +++ b/noisicaa/instr/riff.py @@ -24,7 +24,7 @@ import os.path import io import logging import struct -from typing import List, IO # pylint: disable=unused-import +from typing import List, IO logger = logging.getLogger(__name__) diff --git a/noisicaa/instr/soundfont.py b/noisicaa/instr/soundfont.py index d976a746..c8fd70b4 100644 --- a/noisicaa/instr/soundfont.py +++ b/noisicaa/instr/soundfont.py @@ -22,7 +22,7 @@ import logging import struct -from typing import List, Set, Tuple, IO # pylint: disable=unused-import +from typing import List, Set, Tuple, IO from . import riff diff --git a/noisicaa/instr/wave.py b/noisicaa/instr/wave.py index 5419346b..70d238c8 100644 --- a/noisicaa/instr/wave.py +++ b/noisicaa/instr/wave.py @@ -22,7 +22,7 @@ import logging import struct -from typing import Set, List, IO # pylint: disable=unused-import +from typing import Set, List, IO from . import riff diff --git a/noisicaa/instrument_db/client.py b/noisicaa/instrument_db/client.py index e4b71dd4..65b74cea 100644 --- a/noisicaa/instrument_db/client.py +++ b/noisicaa/instrument_db/client.py @@ -22,7 +22,7 @@ import asyncio import logging -from typing import Dict, Set, List, Iterable # pylint: disable=unused-import +from typing import Dict, Set, List, Iterable from noisicaa import core from noisicaa.core import ipc diff --git a/noisicaa/instrument_db/private/db.py b/noisicaa/instrument_db/private/db.py index 8b90e4d7..ecc3bbe2 100644 --- a/noisicaa/instrument_db/private/db.py +++ b/noisicaa/instrument_db/private/db.py @@ -29,7 +29,7 @@ import queue import sys import threading import time -from typing import Any, Callable, Dict, List, Set, Iterable # pylint: disable=unused-import +from typing import Any, Callable, Dict, List, Set, Iterable from noisicaa import core from noisicaa import instrument_db diff --git a/noisicaa/instrument_db/private/sample_scanner.py b/noisicaa/instrument_db/private/sample_scanner.py index a3757162..6148ec66 100644 --- a/noisicaa/instrument_db/private/sample_scanner.py +++ b/noisicaa/instrument_db/private/sample_scanner.py @@ -23,7 +23,7 @@ import logging import os import os.path -from typing import Dict, Iterable, Any # pylint: disable=unused-import +from typing import Dict, Iterable, Any from noisicaa import instrument_db from noisicaa.instr import wave diff --git a/noisicaa/instrument_db/private/soundfont_scanner.py b/noisicaa/instrument_db/private/soundfont_scanner.py index c495f91c..0a5531d6 100644 --- a/noisicaa/instrument_db/private/soundfont_scanner.py +++ b/noisicaa/instrument_db/private/soundfont_scanner.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import Iterable # pylint: disable=unused-import +from typing import Iterable from noisicaa import instrument_db from noisicaa.instr import soundfont diff --git a/noisicaa/instrument_db/process.py b/noisicaa/instrument_db/process.py index f7635e0f..85c82c09 100644 --- a/noisicaa/instrument_db/process.py +++ b/noisicaa/instrument_db/process.py @@ -22,14 +22,14 @@ import logging import time -from typing import cast, Any, List, Set # pylint: disable=unused-import +from typing import cast, Any, List, Set from noisicaa import constants from noisicaa import core from .private import db from . import process_base -from . import mutations as mutations_lib # pylint: disable=unused-import +from . import mutations as mutations_lib logger = logging.getLogger(__name__) diff --git a/noisicaa/logging.py b/noisicaa/logging.py index 86b6d25a..7a719dfb 100644 --- a/noisicaa/logging.py +++ b/noisicaa/logging.py @@ -24,7 +24,7 @@ import sys import logging.handlers from logging import * # pylint: disable=W0614,W0401 import queue -from typing import Any, Dict, Optional, List, Tuple, Type # pylint: disable=unused-import +from typing import Any, Dict, Optional, List, Tuple from . import runtime_settings as runtime_settings_lib diff --git a/noisicaa/lv2/urid_mapper_process_test.py b/noisicaa/lv2/urid_mapper_process_test.py index a40e9302..eda9c772 100644 --- a/noisicaa/lv2/urid_mapper_process_test.py +++ b/noisicaa/lv2/urid_mapper_process_test.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import Dict # pylint: disable=unused-import +from typing import Dict from noisidev import unittest from noisicaa.constants import TEST_OPTS diff --git a/noisicaa/model/model_base_test.py b/noisicaa/model/model_base_test.py index 5388c35b..19149ab3 100644 --- a/noisicaa/model/model_base_test.py +++ b/noisicaa/model/model_base_test.py @@ -21,9 +21,7 @@ # @end:license import collections -from typing import cast, Any, Optional, Type, Iterator, Dict, List, Tuple # pylint: disable=unused-import - -from google.protobuf import message as protobuf # pylint: disable=unused-import +from typing import cast, Any, Optional, Type, Iterator, List, Tuple from noisidev import unittest from noisicaa import core diff --git a/noisicaa/model/pitch.py b/noisicaa/model/pitch.py index 6f91132b..acabc2ff 100644 --- a/noisicaa/model/pitch.py +++ b/noisicaa/model/pitch.py @@ -21,7 +21,7 @@ # @end:license import re -from typing import Optional, Union, Dict, List, Set, Tuple # pylint: disable=unused-import +from typing import Optional, Union, Dict, List, Set, Tuple from google.protobuf import message as protobuf diff --git a/noisicaa/model/project.py b/noisicaa/model/project.py index 1e4912c1..2e4f5640 100644 --- a/noisicaa/model/project.py +++ b/noisicaa/model/project.py @@ -22,9 +22,7 @@ import fractions import logging -from typing import cast, Any, Dict, Set, Iterator, Sequence, List, Union # pylint: disable=unused-import - -from google.protobuf import message as protobuf # pylint: disable=unused-import +from typing import cast, Any, Dict, Set, Sequence, List, Union from noisicaa.core.typing_extra import down_cast from noisicaa import core diff --git a/noisicaa/music/base_track.py b/noisicaa/music/base_track.py index 638c5811..4385af58 100644 --- a/noisicaa/music/base_track.py +++ b/noisicaa/music/base_track.py @@ -22,14 +22,14 @@ import logging import random -from typing import Any, Optional, Callable, Iterator, Dict, List, Type # pylint: disable=unused-import +from typing import Any, Optional, Callable, Iterator, Dict, List, Type from google.protobuf import message as protobuf from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc from noisicaa import model -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from . import pipeline_graph from . import pmodel from . import commands diff --git a/noisicaa/music/base_track_test.py b/noisicaa/music/base_track_test.py index ca597389..c021e143 100644 --- a/noisicaa/music/base_track_test.py +++ b/noisicaa/music/base_track_test.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import Type # pylint: disable=unused-import +from typing import Type from noisidev import unittest from . import commands_pb2 diff --git a/noisicaa/music/commands.py b/noisicaa/music/commands.py index ae46d065..0a7e0d20 100644 --- a/noisicaa/music/commands.py +++ b/noisicaa/music/commands.py @@ -22,9 +22,7 @@ import logging import time -from typing import ( # pylint: disable=unused-import - cast, Any, Optional, Generator, Dict, List, Tuple, Type -) +from typing import Any, Dict, Type from google.protobuf import message as protobuf diff --git a/noisicaa/music/commands_test.py b/noisicaa/music/commands_test.py index 3a519b8d..17eaf698 100644 --- a/noisicaa/music/commands_test.py +++ b/noisicaa/music/commands_test.py @@ -26,7 +26,7 @@ import uuid from noisidev import unittest_mixins from noisicaa.constants import TEST_OPTS -from noisicaa import model # pylint: disable=unused-import +from noisicaa import model from . import project_client logger = logging.getLogger(__name__) diff --git a/noisicaa/music/control_track.py b/noisicaa/music/control_track.py index 4a930e22..6d28b582 100644 --- a/noisicaa/music/control_track.py +++ b/noisicaa/music/control_track.py @@ -22,14 +22,14 @@ import logging import random -from typing import cast, Any, Dict, Optional, Iterator # pylint: disable=unused-import +from typing import cast, Any, Dict, Optional, Iterator from google.protobuf import message as protobuf from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc from noisicaa import model -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from . import pmodel from . import base_track from . import commands diff --git a/noisicaa/music/control_track_test.py b/noisicaa/music/control_track_test.py index c36346a6..f44c4896 100644 --- a/noisicaa/music/control_track_test.py +++ b/noisicaa/music/control_track_test.py @@ -20,7 +20,7 @@ # # @end:license -from typing import List # pylint: disable=unused-import +from typing import List from noisidev import unittest from noisidev import unittest_mixins diff --git a/noisicaa/music/mutations.py b/noisicaa/music/mutations.py index 0effae4f..6d47ce56 100644 --- a/noisicaa/music/mutations.py +++ b/noisicaa/music/mutations.py @@ -23,11 +23,11 @@ import contextlib import copy import logging -from typing import Any, Iterable, List, Tuple, Generator # pylint: disable=unused-import +from typing import Any, Generator from noisicaa import audioproc from noisicaa import model -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from . import pmodel from . import mutations_pb2 diff --git a/noisicaa/music/pipeline_graph.py b/noisicaa/music/pipeline_graph.py index 3f9011ea..9786cc02 100644 --- a/noisicaa/music/pipeline_graph.py +++ b/noisicaa/music/pipeline_graph.py @@ -23,7 +23,7 @@ #import io import logging #from xml.etree import ElementTree -from typing import cast, Any, Optional, Union, Iterator, List # pylint: disable=unused-import +from typing import Any, Optional, Iterator, List from google.protobuf import message as protobuf diff --git a/noisicaa/music/player.py b/noisicaa/music/player.py index 3d8a2ee1..52da81cd 100644 --- a/noisicaa/music/player.py +++ b/noisicaa/music/player.py @@ -24,7 +24,7 @@ import asyncio import concurrent.futures import logging import uuid -from typing import cast, Any, Optional, Iterator, Dict, Tuple # pylint: disable=unused-import +from typing import cast, Any, Optional, Iterator, Dict, Tuple from noisicaa import core from noisicaa.core import ipc @@ -32,7 +32,7 @@ from noisicaa import audioproc from noisicaa import model from . import pmodel -from . import base_track # pylint: disable=unused-import +from . import base_track logger = logging.getLogger(__name__) diff --git a/noisicaa/music/pmodel_test.py b/noisicaa/music/pmodel_test.py index ad4fdcc7..20b1506d 100644 --- a/noisicaa/music/pmodel_test.py +++ b/noisicaa/music/pmodel_test.py @@ -20,7 +20,7 @@ # # @end:license -from typing import Type # pylint: disable=unused-import +from typing import Type from noisidev import unittest from noisicaa import audioproc diff --git a/noisicaa/music/project.py b/noisicaa/music/project.py index f1feff58..a70ed2ef 100644 --- a/noisicaa/music/project.py +++ b/noisicaa/music/project.py @@ -22,7 +22,7 @@ import itertools import logging -from typing import cast, Any, Optional, Iterator, Dict, Tuple, Type # pylint: disable=unused-import +from typing import cast, Any, Optional, Iterator, Dict, Type from google.protobuf import message as protobuf diff --git a/noisicaa/music/project_client.py b/noisicaa/music/project_client.py index a59f134f..306fffb3 100644 --- a/noisicaa/music/project_client.py +++ b/noisicaa/music/project_client.py @@ -25,9 +25,7 @@ from fractions import Fraction import getpass import logging import socket -from typing import ( # pylint: disable=unused-import - cast, Any, Optional, Dict, Tuple, Callable, Iterable, Iterator, Sequence, Type, TypeVar -) +from typing import cast, Any, Dict, Tuple, Callable, Sequence, TypeVar from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc diff --git a/noisicaa/music/project_client_test.py b/noisicaa/music/project_client_test.py index a95161ba..fa135da7 100644 --- a/noisicaa/music/project_client_test.py +++ b/noisicaa/music/project_client_test.py @@ -24,7 +24,6 @@ import fractions import logging import os.path import uuid -from typing import Dict # pylint: disable=unused-import from noisidev import unittest from noisidev import unittest_mixins diff --git a/noisicaa/music/project_integration_test.py b/noisicaa/music/project_integration_test.py index 412f69ec..b5692189 100644 --- a/noisicaa/music/project_integration_test.py +++ b/noisicaa/music/project_integration_test.py @@ -24,7 +24,7 @@ import copy import logging import os.path import uuid -from typing import Dict, Tuple # pylint: disable=unused-import +from typing import Dict, Tuple import async_generator from google.protobuf import message as protobuf @@ -32,8 +32,8 @@ from google.protobuf import message as protobuf from noisidev import unittest from noisidev import unittest_mixins from noisicaa.constants import TEST_OPTS -from noisicaa import model # pylint: disable=unused-import -from noisicaa.model import model_base_pb2 # pylint: disable=unused-import +from noisicaa import model +from noisicaa.model import model_base_pb2 from . import project_client from . import commands_pb2 diff --git a/noisicaa/music/project_process.py b/noisicaa/music/project_process.py index c3fac8d2..5988543b 100644 --- a/noisicaa/music/project_process.py +++ b/noisicaa/music/project_process.py @@ -26,7 +26,8 @@ import logging import os import os.path import pickle -from typing import cast, Any, Optional, Iterator, Sequence, Type, Dict, List, Tuple, TypeVar # pylint: disable=unused-import +import typing +from typing import cast, Any, Optional, Type, Dict, Tuple, TypeVar from noisicaa import core from noisicaa.core import ipc @@ -39,9 +40,11 @@ from . import commands from . import commands_pb2 from . import player as player_lib from . import render -from . import pmodel # pylint: disable=unused-import from . import render_settings_pb2 +if typing.TYPE_CHECKING: + from . import pmodel + logger = logging.getLogger(__name__) diff --git a/noisicaa/music/render.py b/noisicaa/music/render.py index d4d113e7..83fbdaf5 100644 --- a/noisicaa/music/render.py +++ b/noisicaa/music/render.py @@ -29,7 +29,7 @@ import os import os.path import time import uuid -from typing import cast, Any, Union, Callable, Awaitable, List, Tuple, Text # pylint: disable=unused-import +from typing import cast, Any, Union, Callable, Awaitable, List, Tuple, Text from noisicaa.core.typing_extra import down_cast @@ -161,8 +161,8 @@ class Encoder(object): render_settings_pb2.RenderSettings.MP3: Mp3Encoder, render_settings_pb2.RenderSettings.FAIL__TEST_ONLY__: FailingEncoder, } - cls = cls_map[settings.output_format] - return cls(settings=settings, **kwargs) + encoder_cls = cls_map[settings.output_format] + return encoder_cls(settings=settings, **kwargs) def get_writer(self) -> asyncio.StreamWriter: raise NotImplementedError diff --git a/noisicaa/music/sample_track.py b/noisicaa/music/sample_track.py index e6e0d759..919d7288 100644 --- a/noisicaa/music/sample_track.py +++ b/noisicaa/music/sample_track.py @@ -23,14 +23,14 @@ import fractions import logging import random -from typing import cast, Any, List, Optional, Dict, Iterator # pylint: disable=unused-import +from typing import Any, List, Optional, Dict, Iterator from google.protobuf import message as protobuf from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc from noisicaa import model -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa.bindings import sndfile from . import pmodel from . import base_track diff --git a/noisicaa/music/sample_track_test.py b/noisicaa/music/sample_track_test.py index 9aa9b305..5380b533 100644 --- a/noisicaa/music/sample_track_test.py +++ b/noisicaa/music/sample_track_test.py @@ -21,7 +21,7 @@ # @end:license import os.path -from typing import List # pylint: disable=unused-import +from typing import List from noisidev import unittest from noisidev import unittest_mixins diff --git a/noisicaa/music/score_track_test.py b/noisicaa/music/score_track_test.py index a4e598b7..caca5ced 100644 --- a/noisicaa/music/score_track_test.py +++ b/noisicaa/music/score_track_test.py @@ -20,7 +20,7 @@ # # @end:license -from typing import List # pylint: disable=unused-import +from typing import List from noisidev import unittest from noisidev import unittest_mixins diff --git a/noisicaa/node_db/client.py b/noisicaa/node_db/client.py index c9cb0714..5500b46d 100644 --- a/noisicaa/node_db/client.py +++ b/noisicaa/node_db/client.py @@ -22,7 +22,7 @@ import asyncio import logging -from typing import Dict, Iterable, Set, Tuple # pylint: disable=unused-import +from typing import Dict, Iterable, Set, Tuple from noisicaa import core from noisicaa.core import ipc diff --git a/noisicaa/node_db/private/db.py b/noisicaa/node_db/private/db.py index 2b72213b..ea70043b 100644 --- a/noisicaa/node_db/private/db.py +++ b/noisicaa/node_db/private/db.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import Iterator, Dict # pylint: disable=unused-import +from typing import Iterator, Dict from noisicaa import node_db diff --git a/noisicaa/node_db/process.py b/noisicaa/node_db/process.py index 7f5b63ae..61ced9a8 100644 --- a/noisicaa/node_db/process.py +++ b/noisicaa/node_db/process.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import cast, Any, Set, Dict, List # pylint: disable=unused-import +from typing import cast, Any, Set from noisicaa import core from .private import db diff --git a/noisicaa/ui/editor_app.py b/noisicaa/ui/editor_app.py index 4e023740..ffdb4d5d 100644 --- a/noisicaa/ui/editor_app.py +++ b/noisicaa/ui/editor_app.py @@ -26,7 +26,7 @@ import pprint import sys import traceback import types -from typing import Any, Optional, Callable, Sequence, Dict, Type # pylint: disable=unused-import +from typing import Any, Optional, Callable, Sequence, Dict, Type from PyQt5 import QtCore from PyQt5 import QtWidgets diff --git a/noisicaa/ui/editor_window.py b/noisicaa/ui/editor_window.py index f925f48e..42e5895e 100644 --- a/noisicaa/ui/editor_window.py +++ b/noisicaa/ui/editor_window.py @@ -22,7 +22,7 @@ import logging import textwrap -from typing import cast, Any, Optional, Iterator, List # pylint: disable=unused-import +from typing import cast, Any, Optional, Iterator from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/flowlayout.py b/noisicaa/ui/flowlayout.py index da328cdd..87804f22 100644 --- a/noisicaa/ui/flowlayout.py +++ b/noisicaa/ui/flowlayout.py @@ -23,7 +23,7 @@ # mypy: loose import functools -from typing import List # pylint: disable=unused-import +from typing import List from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/instrument_library.py b/noisicaa/ui/instrument_library.py index b60911ae..25227b3f 100644 --- a/noisicaa/ui/instrument_library.py +++ b/noisicaa/ui/instrument_library.py @@ -28,7 +28,7 @@ import pprint import random import textwrap import uuid -from typing import cast, Any, Optional, Iterator, List, Tuple # pylint: disable=unused-import +from typing import cast, Any, Optional, Iterator, List, Tuple from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/piano.py b/noisicaa/ui/piano.py index 09c358b4..4fc1e239 100644 --- a/noisicaa/ui/piano.py +++ b/noisicaa/ui/piano.py @@ -21,7 +21,7 @@ # @end:license import math -from typing import cast, Optional, Union, Dict # pylint: disable=unused-import +from typing import cast, Optional, Union, Dict from PyQt5.QtCore import Qt from PyQt5 import QtCore @@ -30,7 +30,7 @@ from PyQt5 import QtWidgets from noisicaa import devices from noisicaa import model -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from . import qled diff --git a/noisicaa/ui/pipeline_graph/base_node.py b/noisicaa/ui/pipeline_graph/base_node.py index 6eb5c97e..2c804674 100644 --- a/noisicaa/ui/pipeline_graph/base_node.py +++ b/noisicaa/ui/pipeline_graph/base_node.py @@ -22,7 +22,7 @@ import functools import logging -from typing import cast, Any, Optional, Dict, List, Set # pylint: disable=unused-import +from typing import cast, Any, Optional, Dict, List from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/pipeline_graph/canvas.py b/noisicaa/ui/pipeline_graph/canvas.py index 6b747a68..e6e88bee 100644 --- a/noisicaa/ui/pipeline_graph/canvas.py +++ b/noisicaa/ui/pipeline_graph/canvas.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import cast, Any, Optional, Iterator, Callable, Type, List, Dict, Set # pylint: disable=unused-import +from typing import cast, Any, Optional, Iterator, Callable, Type, List, Dict, Set from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/pipeline_graph/node_widget.py b/noisicaa/ui/pipeline_graph/node_widget.py index 39393f55..0ebcd7d0 100644 --- a/noisicaa/ui/pipeline_graph/node_widget.py +++ b/noisicaa/ui/pipeline_graph/node_widget.py @@ -22,7 +22,7 @@ import functools import logging -from typing import cast, Any, Optional, Dict, List, Set # pylint: disable=unused-import +from typing import Any, Optional, Dict, List from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/pipeline_graph/plugin_ui.py b/noisicaa/ui/pipeline_graph/plugin_ui.py index a077458b..4efa9b8c 100644 --- a/noisicaa/ui/pipeline_graph/plugin_ui.py +++ b/noisicaa/ui/pipeline_graph/plugin_ui.py @@ -22,7 +22,7 @@ import asyncio import logging -from typing import cast, Any, Optional, Dict, List, Set # pylint: disable=unused-import +from typing import Any from PyQt5.QtCore import Qt from PyQt5 import QtGui diff --git a/noisicaa/ui/pipeline_graph/score_track_node.py b/noisicaa/ui/pipeline_graph/score_track_node.py index 34c9809d..0314a8a0 100644 --- a/noisicaa/ui/pipeline_graph/score_track_node.py +++ b/noisicaa/ui/pipeline_graph/score_track_node.py @@ -21,12 +21,12 @@ # @end:license import logging -from typing import cast, Any, Optional, Dict, List, Set # pylint: disable=unused-import +from typing import Any, Dict from PyQt5.QtCore import Qt from PyQt5 import QtWidgets -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa import model from noisicaa import music from noisicaa.ui import ui_base diff --git a/noisicaa/ui/pipeline_graph/track_node.py b/noisicaa/ui/pipeline_graph/track_node.py index 8cc9d9d2..0e4531f3 100644 --- a/noisicaa/ui/pipeline_graph/track_node.py +++ b/noisicaa/ui/pipeline_graph/track_node.py @@ -22,7 +22,7 @@ import logging import os.path -from typing import cast, Any, Optional, Dict, List, Set # pylint: disable=unused-import +from typing import cast, Any from PyQt5 import QtSvg # type: ignore from PyQt5 import QtWidgets diff --git a/noisicaa/ui/pipeline_perf_monitor.py b/noisicaa/ui/pipeline_perf_monitor.py index 6e862647..a4013519 100644 --- a/noisicaa/ui/pipeline_perf_monitor.py +++ b/noisicaa/ui/pipeline_perf_monitor.py @@ -22,7 +22,7 @@ import math import time -from typing import Any, List # pylint: disable=unused-import +from typing import Any, List from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/player_state.py b/noisicaa/ui/player_state.py index 3fc37ad1..0a981b7c 100644 --- a/noisicaa/ui/player_state.py +++ b/noisicaa/ui/player_state.py @@ -22,7 +22,7 @@ import logging import time as time_lib -from typing import cast, Any, Optional, Union, Sequence, Dict, List, Tuple, Type # pylint: disable=unused-import +from typing import Any from PyQt5 import QtCore diff --git a/noisicaa/ui/project_registry.py b/noisicaa/ui/project_registry.py index 6188e714..d83575df 100644 --- a/noisicaa/ui/project_registry.py +++ b/noisicaa/ui/project_registry.py @@ -23,7 +23,7 @@ import asyncio import logging import os.path -from typing import Dict # pylint: disable=unused-import +from typing import Dict from PyQt5 import QtCore diff --git a/noisicaa/ui/project_view.py b/noisicaa/ui/project_view.py index 16356552..742c472c 100644 --- a/noisicaa/ui/project_view.py +++ b/noisicaa/ui/project_view.py @@ -22,7 +22,7 @@ import logging import uuid -from typing import cast, Any, Optional, Union, Sequence, Dict, List, Tuple, Type # pylint: disable=unused-import +from typing import Any, Optional, Tuple from PyQt5.QtCore import Qt from PyQt5 import QtCore @@ -30,7 +30,7 @@ from PyQt5 import QtWidgets from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa import node_db from noisicaa import music from . import pipeline_graph diff --git a/noisicaa/ui/render_dialog.py b/noisicaa/ui/render_dialog.py index 3475499c..28f19a04 100644 --- a/noisicaa/ui/render_dialog.py +++ b/noisicaa/ui/render_dialog.py @@ -24,7 +24,7 @@ import asyncio import enum import logging import os.path -from typing import Any, Optional, Callable, Iterable, BinaryIO, Tuple # pylint: disable=unused-import +from typing import Any, Optional, Callable, Iterable, BinaryIO, Tuple from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/selection_set.py b/noisicaa/ui/selection_set.py index 945ecbd4..812b6ef3 100644 --- a/noisicaa/ui/selection_set.py +++ b/noisicaa/ui/selection_set.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import Iterator, Set # pylint: disable=unused-import +from typing import Iterator, Set logger = logging.getLogger(__name__) diff --git a/noisicaa/ui/slots.py b/noisicaa/ui/slots.py index f274affd..567ba638 100644 --- a/noisicaa/ui/slots.py +++ b/noisicaa/ui/slots.py @@ -22,7 +22,7 @@ import logging import operator -from typing import cast, Any, Dict, Tuple, Type, Callable, Generic, TypeVar # pylint: disable=unused-import +from typing import cast, Any, Dict, Tuple, Type, Callable, TypeVar from PyQt5 import QtCore diff --git a/noisicaa/ui/stat_monitor.py b/noisicaa/ui/stat_monitor.py index 3641f3d7..0559524e 100644 --- a/noisicaa/ui/stat_monitor.py +++ b/noisicaa/ui/stat_monitor.py @@ -24,7 +24,7 @@ import functools import uuid -from typing import List # pylint: disable=unused-import +from typing import List from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/svg_symbol.py b/noisicaa/ui/svg_symbol.py index ec37a796..5f7ed8c7 100644 --- a/noisicaa/ui/svg_symbol.py +++ b/noisicaa/ui/svg_symbol.py @@ -26,7 +26,7 @@ import io import logging import os.path from xml.etree import ElementTree -from typing import Dict, Tuple # pylint: disable=unused-import +from typing import Dict, Tuple from PyQt5 import QtCore # TODO: add stubs for PyQt5.QtSvg diff --git a/noisicaa/ui/track_list/base_track_editor.py b/noisicaa/ui/track_list/base_track_editor.py index f14a5f26..7738d0fc 100644 --- a/noisicaa/ui/track_list/base_track_editor.py +++ b/noisicaa/ui/track_list/base_track_editor.py @@ -22,7 +22,7 @@ import fractions import logging -from typing import Any, Optional, Union, Dict, List, Type # pylint: disable=unused-import +from typing import Any, Type from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/track_list/control_track_editor.py b/noisicaa/ui/track_list/control_track_editor.py index 5c06ecbc..79f1442c 100644 --- a/noisicaa/ui/track_list/control_track_editor.py +++ b/noisicaa/ui/track_list/control_track_editor.py @@ -22,7 +22,7 @@ import fractions import logging -from typing import Any, List, Tuple # pylint: disable=unused-import +from typing import Any, List, Tuple from PyQt5.QtCore import Qt from PyQt5 import QtCore @@ -30,7 +30,7 @@ from PyQt5 import QtGui from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa import music from noisicaa import model from . import base_track_editor diff --git a/noisicaa/ui/track_list/editor.py b/noisicaa/ui/track_list/editor.py index 96b6ac21..65b14841 100644 --- a/noisicaa/ui/track_list/editor.py +++ b/noisicaa/ui/track_list/editor.py @@ -22,7 +22,7 @@ import fractions import logging -from typing import cast, Any, Optional, Union, Sequence, Dict, List, Tuple, Type # pylint: disable=unused-import +from typing import cast, Any, Optional, Union, Dict, List, Type from PyQt5.QtCore import Qt from PyQt5 import QtCore @@ -31,7 +31,7 @@ from PyQt5 import QtWidgets from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa import music from noisicaa import model from noisicaa.ui import ui_base diff --git a/noisicaa/ui/track_list/measured_track_editor.py b/noisicaa/ui/track_list/measured_track_editor.py index 55980aad..55d76182 100644 --- a/noisicaa/ui/track_list/measured_track_editor.py +++ b/noisicaa/ui/track_list/measured_track_editor.py @@ -23,7 +23,7 @@ import fractions import itertools import logging -from typing import Any, Optional, Union, Dict, List, Type # pylint: disable=unused-import +from typing import Any, Optional, Union, Dict, List, Type from PyQt5.QtCore import Qt from PyQt5 import QtCore @@ -32,7 +32,7 @@ from PyQt5 import QtWidgets from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa import music from noisicaa import model from noisicaa.ui import ui_base diff --git a/noisicaa/ui/track_list/sample_track_editor.py b/noisicaa/ui/track_list/sample_track_editor.py index 4c0cbc7b..e16a224b 100644 --- a/noisicaa/ui/track_list/sample_track_editor.py +++ b/noisicaa/ui/track_list/sample_track_editor.py @@ -23,7 +23,7 @@ import fractions import functools import logging -from typing import Any, List, Tuple # pylint: disable=unused-import +from typing import Any, List, Tuple from PyQt5.QtCore import Qt from PyQt5 import QtCore @@ -32,7 +32,7 @@ from PyQt5 import QtWidgets from noisicaa.core.typing_extra import down_cast from noisicaa import audioproc -from noisicaa import core # pylint: disable=unused-import +from noisicaa import core from noisicaa import music from noisicaa import model from noisicaa.model import project_pb2 @@ -251,7 +251,7 @@ class SampleItem(object): painter.drawText(3, 20, "Broken") elif status == 'highres': - samples, = args + samples, = args # pylint: disable=unbalanced-tuple-unpacking ycenter = self.height() // 2 if self.__highlighted: @@ -271,7 +271,7 @@ class SampleItem(object): p_y = y elif status == 'rms': - samples, = args + samples, = args # pylint: disable=unbalanced-tuple-unpacking ycenter = self.height() // 2 if self.__highlighted: diff --git a/noisicaa/ui/track_list/score_track_editor.py b/noisicaa/ui/track_list/score_track_editor.py index 0e7223b8..b8c183e4 100644 --- a/noisicaa/ui/track_list/score_track_editor.py +++ b/noisicaa/ui/track_list/score_track_editor.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import Any, List, Tuple # pylint: disable=unused-import +from typing import Any, List, Tuple from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/track_list/time_line.py b/noisicaa/ui/track_list/time_line.py index 131e2f74..0f9e4814 100644 --- a/noisicaa/ui/track_list/time_line.py +++ b/noisicaa/ui/track_list/time_line.py @@ -21,7 +21,7 @@ # @end:license import logging -from typing import cast, Any, Optional, Union, Sequence, Dict, List, Tuple, Type # pylint: disable=unused-import +from typing import Any from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/track_list/time_view_mixin.py b/noisicaa/ui/track_list/time_view_mixin.py index 133836a8..3b7a715d 100644 --- a/noisicaa/ui/track_list/time_view_mixin.py +++ b/noisicaa/ui/track_list/time_view_mixin.py @@ -22,7 +22,7 @@ import fractions import logging -from typing import cast, Any, Optional, Union, Sequence, Dict, List, Tuple, Type # pylint: disable=unused-import +from typing import Any from PyQt5 import QtCore from PyQt5 import QtGui diff --git a/noisicaa/ui/track_list/tools.py b/noisicaa/ui/track_list/tools.py index 78719c30..1026d7fb 100644 --- a/noisicaa/ui/track_list/tools.py +++ b/noisicaa/ui/track_list/tools.py @@ -23,7 +23,7 @@ import logging import enum import os.path -from typing import Any, List, Dict, Iterator # pylint: disable=unused-import +from typing import Any, List, Dict, Iterator from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/track_list/track_editor_tests.py b/noisicaa/ui/track_list/track_editor_tests.py index e9a6bb2a..c5459bc2 100644 --- a/noisicaa/ui/track_list/track_editor_tests.py +++ b/noisicaa/ui/track_list/track_editor_tests.py @@ -25,7 +25,7 @@ import contextlib from fractions import Fraction from unittest import mock -from typing import List, Set # pylint: disable=unused-import +from typing import List, Set from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/track_list/view.py b/noisicaa/ui/track_list/view.py index 00b0e751..d986df6b 100644 --- a/noisicaa/ui/track_list/view.py +++ b/noisicaa/ui/track_list/view.py @@ -23,7 +23,7 @@ import fractions import logging import time as time_lib -from typing import cast, Any, Optional, Union, Sequence, Dict, List, Tuple, Type # pylint: disable=unused-import +from typing import Any, Optional, Dict from PyQt5.QtCore import Qt from PyQt5 import QtCore diff --git a/noisicaa/ui/ui_base.py b/noisicaa/ui/ui_base.py index fa629e35..57aba642 100644 --- a/noisicaa/ui/ui_base.py +++ b/noisicaa/ui/ui_base.py @@ -23,21 +23,24 @@ import asyncio import functools import io +import typing from typing import Any, Optional, Dict, Tuple, Callable, Awaitable -from PyQt5 import QtCore # pylint: disable=unused-import +from PyQt5 import QtCore from PyQt5 import QtWidgets from noisicaa import audioproc from noisicaa import music from noisicaa import core -from noisicaa import instrument_db as instrument_db_lib # pylint: disable=unused-import -from noisicaa import node_db as node_db_lib # pylint: disable=unused-import -from noisicaa import devices # pylint: disable=unused-import -from noisicaa import runtime_settings as runtime_settings_lib # pylint: disable=unused-import +from noisicaa import devices from . import selection_set as selection_set_lib from . import project_registry +if typing.TYPE_CHECKING: + from noisicaa import instrument_db as instrument_db_lib + from noisicaa import node_db as node_db_lib + from noisicaa import runtime_settings as runtime_settings_lib + class CommonContext(object): def __init__(self, *, app: 'AbstractEditorApp') -> None: diff --git a/noisicaa/ui/ui_process.py b/noisicaa/ui/ui_process.py index 17aa3021..f472528c 100644 --- a/noisicaa/ui/ui_process.py +++ b/noisicaa/ui/ui_process.py @@ -24,9 +24,9 @@ import functools import asyncio import logging import signal -from typing import Any, Optional, Sequence # pylint: disable=unused-import +from typing import Any, Optional, Sequence -from PyQt5 import QtWidgets # pylint: disable=unused-import +from PyQt5 import QtWidgets import quamash from noisicaa import core diff --git a/noisidev/runtests.py b/noisidev/runtests.py index d6b847ce..248ae5d9 100755 --- a/noisidev/runtests.py +++ b/noisidev/runtests.py @@ -186,7 +186,7 @@ class BuiltinPyTests(unittest.TestCase): ] reporter = PylintReporter() - PylintRunner(args, reporter=reporter, exit=False) + PylintRunner(args, reporter=reporter, do_exit=False) messages = list(reporter.messages) if messages: