From bf0a1eaac7dfb28165eb70a2e14fe32a655d5bdc Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 5 Aug 2021 10:36:42 +0200
Subject: [PATCH] [pre-commit] homogenize/simplify pre-commit and isort options
---
.isort.cfg | 2 +-
.pre-commit-config.yaml | 3 +-
bob/devtools/ci.py | 6 +--
bob/devtools/dav.py | 4 +-
bob/devtools/deploy.py | 3 +-
bob/devtools/graph.py | 13 +++---
bob/devtools/scripts/badges.py | 7 +---
bob/devtools/scripts/build.py | 42 ++++++++++---------
bob/devtools/scripts/caupdate.py | 7 +---
bob/devtools/scripts/changelog.py | 15 +++----
bob/devtools/scripts/ci.py | 28 ++++++-------
bob/devtools/scripts/commitfile.py | 7 +---
bob/devtools/scripts/create.py | 17 ++------
bob/devtools/scripts/dav.py | 10 +----
bob/devtools/scripts/dumpsphinx.py | 3 +-
bob/devtools/scripts/getpath.py | 6 +--
bob/devtools/scripts/graph.py | 23 +++++-----
bob/devtools/scripts/jobs.py | 5 +--
bob/devtools/scripts/lasttag.py | 8 +---
bob/devtools/scripts/local.py | 6 +--
bob/devtools/scripts/mirror.py | 25 ++++++-----
bob/devtools/scripts/new.py | 3 +-
bob/devtools/scripts/pipelines.py | 4 +-
bob/devtools/scripts/rebuild.py | 42 ++++++++++---------
bob/devtools/scripts/release.py | 13 +++---
bob/devtools/scripts/runners.py | 4 +-
bob/devtools/scripts/settings.py | 9 +---
bob/devtools/scripts/test.py | 29 +++++++------
bob/devtools/scripts/update_bob.py | 7 +---
bob/devtools/scripts/visibility.py | 5 +--
bob/devtools/templates/.isort.cfg | 1 -
.../templates/.pre-commit-config.yaml | 2 +-
bob/devtools/templates/doc/conf.py | 3 +-
bob/devtools/templates/setup.py | 3 +-
bob/devtools/webdav3/client.py | 28 ++++++-------
bob/devtools/webdav3/urn.py | 4 +-
deps/repodata-patches/gen_patch_json.py | 7 +---
deps/repodata-patches/show_diff.py | 4 +-
setup.py | 3 +-
39 files changed, 173 insertions(+), 238 deletions(-)
diff --git a/.isort.cfg b/.isort.cfg
index 8d7af1de..7c64f804 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -1,4 +1,4 @@
[settings]
-line_length=88
+profile=black
order_by_type=true
lines_between_types=1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 82e14d58..1741c9ff 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,8 +6,7 @@ repos:
hooks:
- id: isort
args: [
- --force-single-line-imports,
- --line-length, "88",
+ --profile, "black",
--order-by-type,
--lines-between-types, "1"
]
diff --git a/bob/devtools/ci.py b/bob/devtools/ci.py
index 0206740f..08a5155d 100644
--- a/bob/devtools/ci.py
+++ b/bob/devtools/ci.py
@@ -9,8 +9,7 @@ import distutils.version
import git
from .build import load_order_file
-from .log import echo_info
-from .log import get_logger
+from .log import echo_info, get_logger
logger = get_logger(__name__)
@@ -244,8 +243,7 @@ def cleanup(dry_run, username, password, includes):
"""
- from .constants import SERVER
- from .constants import WEBDAV_PATHS
+ from .constants import SERVER, WEBDAV_PATHS
from .dav import remove_old_beta_packages
from .deploy import _setup_webdav_client
diff --git a/bob/devtools/dav.py b/bob/devtools/dav.py
index f29f8fc8..9cf67b92 100644
--- a/bob/devtools/dav.py
+++ b/bob/devtools/dav.py
@@ -11,9 +11,7 @@ import dateutil.parser
from .config import read_config
from .deploy import _setup_webdav_client
-from .log import echo_normal
-from .log import echo_warning
-from .log import get_logger
+from .log import echo_normal, echo_warning, get_logger
logger = get_logger(__name__)
diff --git a/bob/devtools/deploy.py b/bob/devtools/deploy.py
index 18122396..ff278e3d 100644
--- a/bob/devtools/deploy.py
+++ b/bob/devtools/deploy.py
@@ -6,8 +6,7 @@
import os
-from .constants import SERVER
-from .constants import WEBDAV_PATHS
+from .constants import SERVER, WEBDAV_PATHS
from .log import get_logger
logger = get_logger(__name__)
diff --git a/bob/devtools/graph.py b/bob/devtools/graph.py
index 0b61ce30..ac0a0e68 100644
--- a/bob/devtools/graph.py
+++ b/bob/devtools/graph.py
@@ -12,12 +12,13 @@ import tempfile
from io import BytesIO
from .bootstrap import set_environment
-from .build import get_output_path
-from .build import get_parsed_recipe
-from .build import get_rendered_metadata
-from .build import next_build_number
-from .log import echo_info
-from .log import get_logger
+from .build import (
+ get_output_path,
+ get_parsed_recipe,
+ get_rendered_metadata,
+ next_build_number,
+)
+from .log import echo_info, get_logger
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/badges.py b/bob/devtools/scripts/badges.py
index fa0d0496..a5dda6f3 100644
--- a/bob/devtools/scripts/badges.py
+++ b/bob/devtools/scripts/badges.py
@@ -4,11 +4,8 @@
import click
import gitlab
-from ..log import echo_warning
-from ..log import get_logger
-from ..log import verbosity_option
-from ..release import get_gitlab_instance
-from ..release import update_files_at_master
+from ..log import echo_warning, get_logger, verbosity_option
+from ..release import get_gitlab_instance, update_files_at_master
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index 52ba4eb8..a251f6d7 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -8,26 +8,28 @@ import click
import conda_build.api
import yaml
-from ..bootstrap import get_channels
-from ..bootstrap import set_environment
-from ..build import conda_arch
-from ..build import get_docserver_setup
-from ..build import get_env_directory
-from ..build import get_output_path
-from ..build import get_parsed_recipe
-from ..build import get_rendered_metadata
-from ..build import make_conda_config
-from ..build import next_build_number
-from ..build import root_logger_protection
-from ..build import should_skip_build
-from ..constants import BASE_CONDARC
-from ..constants import BOBRC_PATH
-from ..constants import CONDA_BUILD_CONFIG
-from ..constants import CONDA_RECIPE_APPEND
-from ..constants import MATPLOTLIB_RCDIR
-from ..constants import SERVER
-from ..log import get_logger
-from ..log import verbosity_option
+from ..bootstrap import get_channels, set_environment
+from ..build import (
+ conda_arch,
+ get_docserver_setup,
+ get_env_directory,
+ get_output_path,
+ get_parsed_recipe,
+ get_rendered_metadata,
+ make_conda_config,
+ next_build_number,
+ root_logger_protection,
+ should_skip_build,
+)
+from ..constants import (
+ BASE_CONDARC,
+ BOBRC_PATH,
+ CONDA_BUILD_CONFIG,
+ CONDA_RECIPE_APPEND,
+ MATPLOTLIB_RCDIR,
+ SERVER,
+)
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/caupdate.py b/bob/devtools/scripts/caupdate.py
index e3ba1055..7e717ea8 100644
--- a/bob/devtools/scripts/caupdate.py
+++ b/bob/devtools/scripts/caupdate.py
@@ -2,8 +2,7 @@
import click
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
@@ -33,9 +32,7 @@ def caupdate():
import requests
- from ..constants import CACERT
- from ..constants import CACERT_URL
- from ..constants import IDIAP_ROOT_CA
+ from ..constants import CACERT, CACERT_URL, IDIAP_ROOT_CA
logger.info("Retrieving %s...", CACERT_URL)
r = requests.get(CACERT_URL, allow_redirects=True)
diff --git a/bob/devtools/scripts/changelog.py b/bob/devtools/scripts/changelog.py
index db9eb429..193d2299 100644
--- a/bob/devtools/scripts/changelog.py
+++ b/bob/devtools/scripts/changelog.py
@@ -2,8 +2,7 @@
import click
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
@@ -101,11 +100,13 @@ def changelog(target, changelog, group, mode, since):
import os
import sys
- from ..changelog import get_changes_since
- from ..changelog import get_last_tag
- from ..changelog import get_last_tag_date
- from ..changelog import parse_date
- from ..changelog import write_tags_with_commits
+ from ..changelog import (
+ get_changes_since,
+ get_last_tag,
+ get_last_tag_date,
+ parse_date,
+ write_tags_with_commits,
+ )
from ..release import get_gitlab_instance
gl = get_gitlab_instance()
diff --git a/bob/devtools/scripts/ci.py b/bob/devtools/scripts/ci.py
index e87a249a..2ceadb1b 100644
--- a/bob/devtools/scripts/ci.py
+++ b/bob/devtools/scripts/ci.py
@@ -11,22 +11,18 @@ import yaml
from click_plugins import with_plugins
-from ..build import comment_cleanup
-from ..build import load_order_file
-from ..build import uniq
-from ..ci import cleanup
-from ..ci import is_private
-from ..ci import read_packages
-from ..ci import select_conda_build_config
-from ..ci import select_conda_recipe_append
-from ..ci import select_user_condarc
-from ..constants import BASE_CONDARC
-from ..constants import SERVER
-from ..deploy import deploy_conda_package
-from ..deploy import deploy_documentation
-from ..log import echo_normal
-from ..log import get_logger
-from ..log import verbosity_option
+from ..build import comment_cleanup, load_order_file, uniq
+from ..ci import (
+ cleanup,
+ is_private,
+ read_packages,
+ select_conda_build_config,
+ select_conda_recipe_append,
+ select_user_condarc,
+)
+from ..constants import BASE_CONDARC, SERVER
+from ..deploy import deploy_conda_package, deploy_documentation
+from ..log import echo_normal, get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/commitfile.py b/bob/devtools/scripts/commitfile.py
index 79bc23ec..3100455c 100644
--- a/bob/devtools/scripts/commitfile.py
+++ b/bob/devtools/scripts/commitfile.py
@@ -4,11 +4,8 @@ import os
import click
-from ..log import get_logger
-from ..log import verbosity_option
-from ..release import get_gitlab_instance
-from ..release import update_files_at_master
-from ..release import update_files_with_mr
+from ..log import get_logger, verbosity_option
+from ..release import get_gitlab_instance, update_files_at_master, update_files_with_mr
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/create.py b/bob/devtools/scripts/create.py
index 2eec5814..c3ec1ce9 100644
--- a/bob/devtools/scripts/create.py
+++ b/bob/devtools/scripts/create.py
@@ -8,20 +8,11 @@ import warnings
import click
import yaml
-from ..bootstrap import run_cmdline
-from ..bootstrap import set_environment
-from ..build import conda_create
-from ..build import make_conda_config
-from ..build import parse_dependencies
-from ..build import uniq
+from ..bootstrap import run_cmdline, set_environment
+from ..build import conda_create, make_conda_config, parse_dependencies, uniq
from ..config import read_config
-from ..constants import BASE_CONDARC
-from ..constants import CONDA_BUILD_CONFIG
-from ..constants import CONDA_RECIPE_APPEND
-from ..constants import SERVER
-from ..log import echo_normal
-from ..log import get_logger
-from ..log import verbosity_option
+from ..constants import BASE_CONDARC, CONDA_BUILD_CONFIG, CONDA_RECIPE_APPEND, SERVER
+from ..log import echo_normal, get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/dav.py b/bob/devtools/scripts/dav.py
index a1054daa..8992f60d 100644
--- a/bob/devtools/scripts/dav.py
+++ b/bob/devtools/scripts/dav.py
@@ -8,14 +8,8 @@ import pkg_resources
from click_plugins import with_plugins
-from ..dav import augment_path_with_hash
-from ..dav import remove_old_beta_packages
-from ..dav import setup_webdav_client
-from ..log import echo_info
-from ..log import echo_normal
-from ..log import echo_warning
-from ..log import get_logger
-from ..log import verbosity_option
+from ..dav import augment_path_with_hash, remove_old_beta_packages, setup_webdav_client
+from ..log import echo_info, echo_normal, echo_warning, get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/dumpsphinx.py b/bob/devtools/scripts/dumpsphinx.py
index 047a06fc..2260853c 100644
--- a/bob/devtools/scripts/dumpsphinx.py
+++ b/bob/devtools/scripts/dumpsphinx.py
@@ -6,8 +6,7 @@ import click
from sphinx.ext import intersphinx
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/getpath.py b/bob/devtools/scripts/getpath.py
index b6f61349..3c787ba2 100644
--- a/bob/devtools/scripts/getpath.py
+++ b/bob/devtools/scripts/getpath.py
@@ -2,10 +2,8 @@
import click
-from ..log import get_logger
-from ..log import verbosity_option
-from ..release import download_path
-from ..release import get_gitlab_instance
+from ..log import get_logger, verbosity_option
+from ..release import download_path, get_gitlab_instance
from . import bdt
from .common_options import ref_option
diff --git a/bob/devtools/scripts/graph.py b/bob/devtools/scripts/graph.py
index 7c590444..b66caaed 100644
--- a/bob/devtools/scripts/graph.py
+++ b/bob/devtools/scripts/graph.py
@@ -6,19 +6,18 @@ import sys
import click
import yaml
-from ..bootstrap import get_channels
-from ..bootstrap import set_environment
+from ..bootstrap import get_channels, set_environment
from ..build import make_conda_config
-from ..constants import BASE_CONDARC
-from ..constants import BOBRC_PATH
-from ..constants import CONDA_BUILD_CONFIG
-from ..constants import CONDA_RECIPE_APPEND
-from ..constants import MATPLOTLIB_RCDIR
-from ..constants import SERVER
-from ..graph import compute_adjencence_matrix
-from ..graph import generate_graph
-from ..log import get_logger
-from ..log import verbosity_option
+from ..constants import (
+ BASE_CONDARC,
+ BOBRC_PATH,
+ CONDA_BUILD_CONFIG,
+ CONDA_RECIPE_APPEND,
+ MATPLOTLIB_RCDIR,
+ SERVER,
+)
+from ..graph import compute_adjencence_matrix, generate_graph
+from ..log import get_logger, verbosity_option
from ..release import get_gitlab_instance
from . import bdt
diff --git a/bob/devtools/scripts/jobs.py b/bob/devtools/scripts/jobs.py
index 34d679bc..2718f7da 100644
--- a/bob/devtools/scripts/jobs.py
+++ b/bob/devtools/scripts/jobs.py
@@ -2,10 +2,7 @@
import click
-from ..log import echo_info
-from ..log import echo_normal
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import echo_info, echo_normal, get_logger, verbosity_option
from ..release import get_gitlab_instance
from . import bdt
diff --git a/bob/devtools/scripts/lasttag.py b/bob/devtools/scripts/lasttag.py
index 053885c9..9e9bfd54 100644
--- a/bob/devtools/scripts/lasttag.py
+++ b/bob/devtools/scripts/lasttag.py
@@ -3,12 +3,8 @@
import click
import gitlab
-from ..changelog import get_last_tag
-from ..changelog import parse_date
-from ..log import echo_normal
-from ..log import echo_warning
-from ..log import get_logger
-from ..log import verbosity_option
+from ..changelog import get_last_tag, parse_date
+from ..log import echo_normal, echo_warning, get_logger, verbosity_option
from ..release import get_gitlab_instance
from . import bdt
diff --git a/bob/devtools/scripts/local.py b/bob/devtools/scripts/local.py
index 62989890..50f49d50 100644
--- a/bob/devtools/scripts/local.py
+++ b/bob/devtools/scripts/local.py
@@ -9,10 +9,8 @@ import pkg_resources
from click_plugins import with_plugins
-from ..log import get_logger
-from ..log import verbosity_option
-from . import bdt
-from . import ci
+from ..log import get_logger, verbosity_option
+from . import bdt, ci
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/mirror.py b/bob/devtools/scripts/mirror.py
index 3ffbeaec..73542b87 100644
--- a/bob/devtools/scripts/mirror.py
+++ b/bob/devtools/scripts/mirror.py
@@ -9,19 +9,18 @@ import tempfile
import click
import conda_build.api
-from ..log import echo_info
-from ..log import echo_warning
-from ..log import get_logger
-from ..log import verbosity_option
-from ..mirror import blacklist_filter
-from ..mirror import checksum_packages
-from ..mirror import copy_and_clean_patch
-from ..mirror import download_packages
-from ..mirror import get_json
-from ..mirror import get_local_contents
-from ..mirror import load_glob_list
-from ..mirror import remove_packages
-from ..mirror import whitelist_filter
+from ..log import echo_info, echo_warning, get_logger, verbosity_option
+from ..mirror import (
+ blacklist_filter,
+ checksum_packages,
+ copy_and_clean_patch,
+ download_packages,
+ get_json,
+ get_local_contents,
+ load_glob_list,
+ remove_packages,
+ whitelist_filter,
+)
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/new.py b/bob/devtools/scripts/new.py
index b484d3da..76c4a04b 100644
--- a/bob/devtools/scripts/new.py
+++ b/bob/devtools/scripts/new.py
@@ -8,8 +8,7 @@ import click
import jinja2
import pkg_resources
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/pipelines.py b/bob/devtools/scripts/pipelines.py
index a658b322..ac7bc411 100644
--- a/bob/devtools/scripts/pipelines.py
+++ b/bob/devtools/scripts/pipelines.py
@@ -7,9 +7,7 @@ import gitlab
from tabulate import tabulate
-from ..log import echo_warning
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import echo_warning, get_logger, verbosity_option
from ..pipelines import process_log
from ..release import get_gitlab_instance
from . import bdt
diff --git a/bob/devtools/scripts/rebuild.py b/bob/devtools/scripts/rebuild.py
index aa6b7ace..f183f7a4 100644
--- a/bob/devtools/scripts/rebuild.py
+++ b/bob/devtools/scripts/rebuild.py
@@ -9,26 +9,28 @@ import click
import conda_build.api
import yaml
-from ..bootstrap import get_channels
-from ..bootstrap import set_environment
-from ..build import conda_arch
-from ..build import get_docserver_setup
-from ..build import get_env_directory
-from ..build import get_output_path
-from ..build import get_parsed_recipe
-from ..build import get_rendered_metadata
-from ..build import make_conda_config
-from ..build import next_build_number
-from ..build import root_logger_protection
-from ..build import should_skip_build
-from ..constants import BASE_CONDARC
-from ..constants import BOBRC_PATH
-from ..constants import CONDA_BUILD_CONFIG
-from ..constants import CONDA_RECIPE_APPEND
-from ..constants import MATPLOTLIB_RCDIR
-from ..constants import SERVER
-from ..log import get_logger
-from ..log import verbosity_option
+from ..bootstrap import get_channels, set_environment
+from ..build import (
+ conda_arch,
+ get_docserver_setup,
+ get_env_directory,
+ get_output_path,
+ get_parsed_recipe,
+ get_rendered_metadata,
+ make_conda_config,
+ next_build_number,
+ root_logger_protection,
+ should_skip_build,
+)
+from ..constants import (
+ BASE_CONDARC,
+ BOBRC_PATH,
+ CONDA_BUILD_CONFIG,
+ CONDA_RECIPE_APPEND,
+ MATPLOTLIB_RCDIR,
+ SERVER,
+)
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/release.py b/bob/devtools/scripts/release.py
index 95326b7c..eeaceeab 100644
--- a/bob/devtools/scripts/release.py
+++ b/bob/devtools/scripts/release.py
@@ -4,8 +4,7 @@
import click
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
@@ -136,10 +135,12 @@ def release(changelog, group, package, resume, dry_run):
you need to release that package first.
"""
- from ..release import get_gitlab_instance
- from ..release import parse_and_process_package_changelog
- from ..release import release_package
- from ..release import wait_for_pipeline_to_finish
+ from ..release import (
+ get_gitlab_instance,
+ parse_and_process_package_changelog,
+ release_package,
+ wait_for_pipeline_to_finish,
+ )
gl = get_gitlab_instance()
diff --git a/bob/devtools/scripts/runners.py b/bob/devtools/scripts/runners.py
index 8eee83f8..637f27bc 100644
--- a/bob/devtools/scripts/runners.py
+++ b/bob/devtools/scripts/runners.py
@@ -4,9 +4,7 @@ import os
import click
-from ..log import echo_normal
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import echo_normal, get_logger, verbosity_option
from ..release import get_gitlab_instance
from . import bdt
diff --git a/bob/devtools/scripts/settings.py b/bob/devtools/scripts/settings.py
index 90ddf815..80a61b6f 100644
--- a/bob/devtools/scripts/settings.py
+++ b/bob/devtools/scripts/settings.py
@@ -5,15 +5,10 @@ import os
import click
-from ..log import echo_info
-from ..log import echo_normal
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import echo_info, echo_normal, get_logger, verbosity_option
from ..release import get_gitlab_instance
from . import bdt
-from .runners import _get_project
-from .runners import _get_projects_from_file
-from .runners import _get_projects_from_group
+from .runners import _get_project, _get_projects_from_file, _get_projects_from_group
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/test.py b/bob/devtools/scripts/test.py
index f5e55f70..722f1a60 100644
--- a/bob/devtools/scripts/test.py
+++ b/bob/devtools/scripts/test.py
@@ -8,19 +8,22 @@ import conda_build.api
import yaml
from ..bootstrap import set_environment
-from ..build import conda_arch
-from ..build import get_docserver_setup
-from ..build import get_env_directory
-from ..build import make_conda_config
-from ..build import root_logger_protection
-from ..constants import BASE_CONDARC
-from ..constants import BOBRC_PATH
-from ..constants import CONDA_BUILD_CONFIG
-from ..constants import CONDA_RECIPE_APPEND
-from ..constants import MATPLOTLIB_RCDIR
-from ..constants import SERVER
-from ..log import get_logger
-from ..log import verbosity_option
+from ..build import (
+ conda_arch,
+ get_docserver_setup,
+ get_env_directory,
+ make_conda_config,
+ root_logger_protection,
+)
+from ..constants import (
+ BASE_CONDARC,
+ BOBRC_PATH,
+ CONDA_BUILD_CONFIG,
+ CONDA_RECIPE_APPEND,
+ MATPLOTLIB_RCDIR,
+ SERVER,
+)
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
diff --git a/bob/devtools/scripts/update_bob.py b/bob/devtools/scripts/update_bob.py
index cf8d121a..7c4dc1e6 100644
--- a/bob/devtools/scripts/update_bob.py
+++ b/bob/devtools/scripts/update_bob.py
@@ -3,8 +3,7 @@
import click
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import get_logger, verbosity_option
from . import bdt
logger = get_logger(__name__)
@@ -27,9 +26,7 @@ def update_bob(stable):
import tempfile
from ..ci import read_packages
- from ..release import download_path
- from ..release import get_gitlab_instance
- from ..release import get_latest_tag_name
+ from ..release import download_path, get_gitlab_instance, get_latest_tag_name
gl = get_gitlab_instance()
diff --git a/bob/devtools/scripts/visibility.py b/bob/devtools/scripts/visibility.py
index d187a8a0..7137f9c0 100644
--- a/bob/devtools/scripts/visibility.py
+++ b/bob/devtools/scripts/visibility.py
@@ -5,10 +5,7 @@ import os
import click
import gitlab
-from ..log import echo_normal
-from ..log import echo_warning
-from ..log import get_logger
-from ..log import verbosity_option
+from ..log import echo_normal, echo_warning, get_logger, verbosity_option
from ..release import get_gitlab_instance
from . import bdt
diff --git a/bob/devtools/templates/.isort.cfg b/bob/devtools/templates/.isort.cfg
index ab6c1fc5..7c64f804 100644
--- a/bob/devtools/templates/.isort.cfg
+++ b/bob/devtools/templates/.isort.cfg
@@ -1,5 +1,4 @@
[settings]
profile=black
-line_length=88
order_by_type=true
lines_between_types=1
diff --git a/bob/devtools/templates/.pre-commit-config.yaml b/bob/devtools/templates/.pre-commit-config.yaml
index 49cebe90..0de60f36 100644
--- a/bob/devtools/templates/.pre-commit-config.yaml
+++ b/bob/devtools/templates/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
rev: 5.8.0
hooks:
- id: isort
- args: [--profile, "black", --sl, --line-length, "88"]
+ args: [--profile, "black"]
- repo: https://github.com/psf/black
rev: 20.8b1
hooks:
diff --git a/bob/devtools/templates/doc/conf.py b/bob/devtools/templates/doc/conf.py
index 7844df4a..07912148 100644
--- a/bob/devtools/templates/doc/conf.py
+++ b/bob/devtools/templates/doc/conf.py
@@ -8,8 +8,7 @@ import pkg_resources
import sphinx_rtd_theme
# For inter-documentation mapping:
-from bob.extension.utils import link_documentation
-from bob.extension.utils import load_requirements
+from bob.extension.utils import link_documentation, load_requirements
# -- General configuration -----------------------------------------------------
diff --git a/bob/devtools/templates/setup.py b/bob/devtools/templates/setup.py
index ec0748cb..08b9d185 100644
--- a/bob/devtools/templates/setup.py
+++ b/bob/devtools/templates/setup.py
@@ -11,8 +11,7 @@ install_requires=load_requirements('requirements.txt')
{% else %}from setuptools import setup, dist
dist.Distribution(dict(setup_requires=['bob.extension']))
-from bob.extension.utils import find_packages
-from bob.extension.utils import load_requirements
+from bob.extension.utils import find_packages, load_requirements
install_requires = load_requirements()
{% endif %}
diff --git a/bob/devtools/webdav3/client.py b/bob/devtools/webdav3/client.py
index 8d08cb83..056a8b5f 100644
--- a/bob/devtools/webdav3/client.py
+++ b/bob/devtools/webdav3/client.py
@@ -12,26 +12,26 @@ import lxml.etree as etree
import requests
from ..log import get_logger
-from .connection import ProxySettings
-from .connection import WebDAVSettings
-from .exceptions import ConnectionException
-from .exceptions import LocalResourceNotFound
-from .exceptions import MethodNotSupported
-from .exceptions import NoConnection
-from .exceptions import NotEnoughSpace
-from .exceptions import OptionNotValid
-from .exceptions import RemoteParentNotFound
-from .exceptions import RemoteResourceNotFound
-from .exceptions import ResourceTooBig
-from .exceptions import ResponseErrorCode
+from .connection import ProxySettings, WebDAVSettings
+from .exceptions import (
+ ConnectionException,
+ LocalResourceNotFound,
+ MethodNotSupported,
+ NoConnection,
+ NotEnoughSpace,
+ OptionNotValid,
+ RemoteParentNotFound,
+ RemoteResourceNotFound,
+ ResourceTooBig,
+ ResponseErrorCode,
+)
from .urn import Urn
logger = get_logger(__name__)
try:
- from urllib.parse import unquote
- from urllib.parse import urlsplit
+ from urllib.parse import unquote, urlsplit
except ImportError:
from urllib import unquote
diff --git a/bob/devtools/webdav3/urn.py b/bob/devtools/webdav3/urn.py
index 342f8afc..4dafe771 100644
--- a/bob/devtools/webdav3/urn.py
+++ b/bob/devtools/webdav3/urn.py
@@ -1,7 +1,5 @@
try:
- from urllib.parse import quote
- from urllib.parse import unquote
- from urllib.parse import urlsplit
+ from urllib.parse import quote, unquote, urlsplit
except ImportError:
from urllib import unquote, quote
from urlparse import urlsplit
diff --git a/deps/repodata-patches/gen_patch_json.py b/deps/repodata-patches/gen_patch_json.py
index 90d6ae3a..6bbdc396 100644
--- a/deps/repodata-patches/gen_patch_json.py
+++ b/deps/repodata-patches/gen_patch_json.py
@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
import copy
import json
@@ -9,8 +7,7 @@ import os
import sys
from collections import defaultdict
-from os.path import isdir
-from os.path import join
+from os.path import isdir, join
import requests
import tqdm
diff --git a/deps/repodata-patches/show_diff.py b/deps/repodata-patches/show_diff.py
index 4141682a..fe6ad42e 100755
--- a/deps/repodata-patches/show_diff.py
+++ b/deps/repodata-patches/show_diff.py
@@ -7,9 +7,7 @@ import os
import urllib
from conda_build.index import _apply_instructions
-from gen_patch_json import BASE_URL
-from gen_patch_json import SUBDIRS
-from gen_patch_json import gen_new_index_and_patch_instructions
+from gen_patch_json import BASE_URL, SUBDIRS, gen_new_index_and_patch_instructions
CACHE_DIR = os.environ.get(
"CACHE_DIR", os.path.join(os.path.dirname(os.path.abspath(__file__)), "cache")
diff --git a/setup.py b/setup.py
index c6eb6bcd..1f5b20d2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
-from setuptools import find_packages
-from setuptools import setup
+from setuptools import find_packages, setup
# Define package version
version = open("version.txt").read().rstrip()
--
GitLab