diff --git a/borgmatic/borg/check.py b/borgmatic/borg/check.py index 7051138d..93e42871 100644 --- a/borgmatic/borg/check.py +++ b/borgmatic/borg/check.py @@ -5,7 +5,6 @@ import subprocess from borgmatic.borg import extract from borgmatic.logger import get_logger - DEFAULT_CHECKS = ('repository', 'archives') DEFAULT_PREFIX = '{hostname}-' diff --git a/borgmatic/borg/create.py b/borgmatic/borg/create.py index ccd9e3fe..3cb88597 100644 --- a/borgmatic/borg/create.py +++ b/borgmatic/borg/create.py @@ -7,7 +7,6 @@ import tempfile from borgmatic.borg.execute import execute_command from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/borg/execute.py b/borgmatic/borg/execute.py index 890af38f..80040bee 100644 --- a/borgmatic/borg/execute.py +++ b/borgmatic/borg/execute.py @@ -2,7 +2,6 @@ import subprocess from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/borg/extract.py b/borgmatic/borg/extract.py index 7d0b2a85..0a9f69dd 100644 --- a/borgmatic/borg/extract.py +++ b/borgmatic/borg/extract.py @@ -1,10 +1,9 @@ import logging -import sys import subprocess +import sys from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/borg/info.py b/borgmatic/borg/info.py index 87117476..6b6df426 100644 --- a/borgmatic/borg/info.py +++ b/borgmatic/borg/info.py @@ -3,7 +3,6 @@ import logging from borgmatic.borg.execute import execute_command from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/borg/list.py b/borgmatic/borg/list.py index bd18deda..cc66a5b9 100644 --- a/borgmatic/borg/list.py +++ b/borgmatic/borg/list.py @@ -3,7 +3,6 @@ import logging from borgmatic.borg.execute import execute_command from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/borg/prune.py b/borgmatic/borg/prune.py index ef4f8b8f..f211b3c5 100644 --- a/borgmatic/borg/prune.py +++ b/borgmatic/borg/prune.py @@ -3,7 +3,6 @@ import subprocess from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index fe12443f..318899e2 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -1,31 +1,28 @@ -from argparse import ArgumentParser import collections -import colorama import json import logging import os -from subprocess import CalledProcessError import sys +from argparse import ArgumentParser +from subprocess import CalledProcessError +import colorama import pkg_resources -from borgmatic.borg import ( - check as borg_check, - create as borg_create, - environment as borg_environment, - prune as borg_prune, - extract as borg_extract, - list as borg_list, - info as borg_info, - init as borg_init, -) +from borgmatic.borg import check as borg_check +from borgmatic.borg import create as borg_create +from borgmatic.borg import environment as borg_environment +from borgmatic.borg import extract as borg_extract +from borgmatic.borg import info as borg_info +from borgmatic.borg import init as borg_init +from borgmatic.borg import list as borg_list +from borgmatic.borg import prune as borg_prune from borgmatic.commands import hook from borgmatic.config import checks, collect, convert, validate -from borgmatic.logger import should_do_markup, get_logger +from borgmatic.logger import get_logger, should_do_markup from borgmatic.signals import configure_signals from borgmatic.verbosity import verbosity_to_log_level - logger = get_logger(__name__) LEGACY_CONFIG_PATH = '/etc/borgmatic/config' diff --git a/borgmatic/commands/convert_config.py b/borgmatic/commands/convert_config.py index 5a0bca12..69568d9b 100644 --- a/borgmatic/commands/convert_config.py +++ b/borgmatic/commands/convert_config.py @@ -1,13 +1,12 @@ -from argparse import ArgumentParser import os import sys import textwrap +from argparse import ArgumentParser from ruamel import yaml from borgmatic.config import convert, generate, legacy, validate - DEFAULT_SOURCE_CONFIG_FILENAME = '/etc/borgmatic/config' DEFAULT_SOURCE_EXCLUDES_FILENAME = '/etc/borgmatic/excludes' DEFAULT_DESTINATION_CONFIG_FILENAME = '/etc/borgmatic/config.yaml' diff --git a/borgmatic/commands/generate_config.py b/borgmatic/commands/generate_config.py index 6e08fccb..f338f303 100644 --- a/borgmatic/commands/generate_config.py +++ b/borgmatic/commands/generate_config.py @@ -1,9 +1,8 @@ -from argparse import ArgumentParser import sys +from argparse import ArgumentParser from borgmatic.config import generate, validate - DEFAULT_DESTINATION_CONFIG_FILENAME = '/etc/borgmatic/config.yaml' diff --git a/borgmatic/commands/hook.py b/borgmatic/commands/hook.py index 0e915c8d..3e284411 100644 --- a/borgmatic/commands/hook.py +++ b/borgmatic/commands/hook.py @@ -2,7 +2,6 @@ import subprocess from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/commands/validate_config.py b/borgmatic/commands/validate_config.py index 606b7931..6ad446b2 100644 --- a/borgmatic/commands/validate_config.py +++ b/borgmatic/commands/validate_config.py @@ -1,6 +1,6 @@ -from argparse import ArgumentParser -import sys import logging +import sys +from argparse import ArgumentParser from borgmatic.config import collect, validate from borgmatic.logger import get_logger diff --git a/borgmatic/config/generate.py b/borgmatic/config/generate.py index 509fcc4b..0f343645 100644 --- a/borgmatic/config/generate.py +++ b/borgmatic/config/generate.py @@ -2,7 +2,6 @@ import os from ruamel import yaml - INDENT = 4 diff --git a/borgmatic/config/legacy.py b/borgmatic/config/legacy.py index 34c0e36c..91352784 100644 --- a/borgmatic/config/legacy.py +++ b/borgmatic/config/legacy.py @@ -1,7 +1,6 @@ from collections import OrderedDict, namedtuple from configparser import RawConfigParser - Section_format = namedtuple('Section_format', ('name', 'options')) Config_option = namedtuple('Config_option', ('name', 'value_type', 'required')) diff --git a/borgmatic/config/load.py b/borgmatic/config/load.py index a3df4c4e..8339dfb1 100644 --- a/borgmatic/config/load.py +++ b/borgmatic/config/load.py @@ -4,7 +4,6 @@ import ruamel.yaml from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/config/validate.py b/borgmatic/config/validate.py index 64b96f53..8c92c470 100644 --- a/borgmatic/config/validate.py +++ b/borgmatic/config/validate.py @@ -8,7 +8,6 @@ import ruamel.yaml from borgmatic.config import load from borgmatic.logger import get_logger - logger = get_logger(__name__) diff --git a/borgmatic/verbosity.py b/borgmatic/verbosity.py index 8444a0bf..300f644b 100644 --- a/borgmatic/verbosity.py +++ b/borgmatic/verbosity.py @@ -1,6 +1,5 @@ import logging - VERBOSITY_WARNING = 0 VERBOSITY_SOME = 1 VERBOSITY_LOTS = 2 diff --git a/setup.py b/setup.py index c799d719..d2ca1f9d 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ -from setuptools import setup, find_packages - +from setuptools import find_packages, setup VERSION = '1.3.4.dev0' diff --git a/tests/integration/commands/test_borgmatic.py b/tests/integration/commands/test_borgmatic.py index 704dc7c9..9232a9b5 100644 --- a/tests/integration/commands/test_borgmatic.py +++ b/tests/integration/commands/test_borgmatic.py @@ -1,7 +1,7 @@ import subprocess -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.commands import borgmatic as module diff --git a/tests/integration/commands/test_convert_config.py b/tests/integration/commands/test_convert_config.py index a846a30b..db227108 100644 --- a/tests/integration/commands/test_convert_config.py +++ b/tests/integration/commands/test_convert_config.py @@ -1,7 +1,7 @@ import os -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.commands import convert_config as module diff --git a/tests/integration/config/test_generate.py b/tests/integration/config/test_generate.py index 5cd93bb9..cf399cb0 100644 --- a/tests/integration/config/test_generate.py +++ b/tests/integration/config/test_generate.py @@ -1,9 +1,9 @@ -from io import StringIO import os import sys +from io import StringIO -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.config import generate as module diff --git a/tests/integration/config/test_legacy.py b/tests/integration/config/test_legacy.py index f9373d03..870da886 100644 --- a/tests/integration/config/test_legacy.py +++ b/tests/integration/config/test_legacy.py @@ -1,7 +1,6 @@ -from io import StringIO - -from collections import OrderedDict import string +from collections import OrderedDict +from io import StringIO from borgmatic.config import legacy as module diff --git a/tests/integration/config/test_validate.py b/tests/integration/config/test_validate.py index 2182d2ee..706743bc 100644 --- a/tests/integration/config/test_validate.py +++ b/tests/integration/config/test_validate.py @@ -2,8 +2,8 @@ import io import string import sys -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.config import validate as module diff --git a/tests/unit/borg/test_check.py b/tests/unit/borg/test_check.py index 95b32c37..2424165d 100644 --- a/tests/unit/borg/test_check.py +++ b/tests/unit/borg/test_check.py @@ -1,11 +1,12 @@ -from subprocess import STDOUT import logging import sys +from subprocess import STDOUT -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.borg import check as module + from ..test_verbosity import insert_logging_mock diff --git a/tests/unit/borg/test_create.py b/tests/unit/borg/test_create.py index 18914fa4..ed50eed1 100644 --- a/tests/unit/borg/test_create.py +++ b/tests/unit/borg/test_create.py @@ -3,6 +3,7 @@ import logging from flexmock import flexmock from borgmatic.borg import create as module + from ..test_verbosity import insert_logging_mock diff --git a/tests/unit/borg/test_execute.py b/tests/unit/borg/test_execute.py index 6bb2938c..a7bc45b5 100644 --- a/tests/unit/borg/test_execute.py +++ b/tests/unit/borg/test_execute.py @@ -1,4 +1,5 @@ from flexmock import flexmock + from borgmatic.borg import execute as module diff --git a/tests/unit/borg/test_extract.py b/tests/unit/borg/test_extract.py index 75b49357..da187ff7 100644 --- a/tests/unit/borg/test_extract.py +++ b/tests/unit/borg/test_extract.py @@ -4,6 +4,7 @@ import sys from flexmock import flexmock from borgmatic.borg import extract as module + from ..test_verbosity import insert_logging_mock diff --git a/tests/unit/borg/test_info.py b/tests/unit/borg/test_info.py index a3abc61b..bf11e928 100644 --- a/tests/unit/borg/test_info.py +++ b/tests/unit/borg/test_info.py @@ -3,8 +3,8 @@ import logging from flexmock import flexmock from borgmatic.borg import info as module -from ..test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock INFO_COMMAND = ('borg', 'info', 'repo') diff --git a/tests/unit/borg/test_init.py b/tests/unit/borg/test_init.py index d420d862..da706839 100644 --- a/tests/unit/borg/test_init.py +++ b/tests/unit/borg/test_init.py @@ -3,8 +3,8 @@ import logging from flexmock import flexmock from borgmatic.borg import init as module -from ..test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock INFO_REPOSITORY_EXISTS_RESPONSE_CODE = 0 INFO_REPOSITORY_NOT_FOUND_RESPONSE_CODE = 2 diff --git a/tests/unit/borg/test_list.py b/tests/unit/borg/test_list.py index ea354b32..fedc92b9 100644 --- a/tests/unit/borg/test_list.py +++ b/tests/unit/borg/test_list.py @@ -3,8 +3,8 @@ import logging from flexmock import flexmock from borgmatic.borg import list as module -from ..test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock LIST_COMMAND = ('borg', 'list', 'repo') diff --git a/tests/unit/borg/test_prune.py b/tests/unit/borg/test_prune.py index 6f82d286..5e426f0f 100644 --- a/tests/unit/borg/test_prune.py +++ b/tests/unit/borg/test_prune.py @@ -4,6 +4,7 @@ from collections import OrderedDict from flexmock import flexmock from borgmatic.borg import prune as module + from ..test_verbosity import insert_logging_mock diff --git a/tests/unit/config/test_convert.py b/tests/unit/config/test_convert.py index 73c30991..cdf1d444 100644 --- a/tests/unit/config/test_convert.py +++ b/tests/unit/config/test_convert.py @@ -1,12 +1,11 @@ -from collections import defaultdict, OrderedDict, namedtuple import os +from collections import OrderedDict, defaultdict, namedtuple -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.config import convert as module - Parsed_config = namedtuple('Parsed_config', ('location', 'storage', 'retention', 'consistency')) diff --git a/tests/unit/config/test_legacy.py b/tests/unit/config/test_legacy.py index e2b213a8..230aa747 100644 --- a/tests/unit/config/test_legacy.py +++ b/tests/unit/config/test_legacy.py @@ -1,7 +1,7 @@ from collections import OrderedDict -from flexmock import flexmock import pytest +from flexmock import flexmock from borgmatic.config import legacy as module