diff --git a/.isort.cfg b/.isort.cfg index 8d7af1de97c8aea738c0f7c503d1461ad413db4f..7c64f804578da7d4a46ae93b27cc6b75fd05d97d 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 82e14d581a22fc0afcebe1b81caa8e725132bfae..1741c9ff8e0e91e880619faedc2bf433652e04eb 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 0206740f9e271ef18950721d3324167a24b10710..08a5155de7503e40d13bd22eff1fef57764b78ed 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 f29f8fc89d60069cdce87fdcf31383111a802ff7..9cf67b92c6e3dbf5844a434e6176d61a1321661f 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 18122396344bd46493ddcb63c6c10cf6fc2e86cf..ff278e3d592d9f17e16725a103dc19a8d81abaf3 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 0b61ce30f5203b64db5b537f2523cd99619eb3ce..ac0a0e681d01d63b995625236994b8799f614063 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 fa0d04969a95f2dddf0e82e510bb79330c97ae87..a5dda6f31c986f611d666546723216ce96f2ca00 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 52ba4eb876e07cffac8f333877385d5ace7f6a23..a251f6d7f040ed84183c5b4461a553501d4d77c4 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 e3ba10550b5c2c04672b4e695cbb45679104b93f..7e717ea882b6c3192a5c1538b5d329f39ac3b954 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 db9eb4296a290c2b83aac388cacbad534c55ffbe..193d22990df69cd3cf7cda7ff1f449cb8df2a718 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 e87a249a8a4762912b0b0f7dc806afe64cbe74f1..2ceadb1bfcd0afe1dcca13da2d5a5f49e782e9f1 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 79bc23eccf68410eddf0a532b1a1610dbce27328..3100455c0a1c0ef4d5870585ec7bdd0c724f937f 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 2eec58143ad9722e3e16067b8fc04d5a4481e27b..c3ec1ce9bc8915bb2c1f9930c51a1396f9d17d0c 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 a1054daaf5c6ec2cd3b180f16e9d92808c421f80..8992f60de90b470336c639cbe09cf19c017008d2 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 047a06fcfa383fc276878a853b16e439fd3247fc..2260853c63ed539efe621ccd0b0a757dafecaf9a 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 b6f61349f8f36e2d0b832c6761c78185b4e0d630..3c787ba26e8bd1cd9b79e9ff96d9fc3d2c4ef580 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 7c590444353f784a3030d95de8fd30f1c58153ac..b66caaedbb5826c559221d5606e11ad01a525f11 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 34d679bce61e954636ef2566374282c38c6e44d0..2718f7daa568d1ae62ed9a2d4dbe5b70b81a995c 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 053885c9f6c38103052965c7da0747f1eab90eea..9e9bfd54401d22c05b97f409b6261577ec605700 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 629898908eb66f0c8757b23167a8bf827446c8f7..50f49d505376c332b5d2405e121c8119d77de157 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 3ffbeaec621eede0e1bbf125d38cd8b666254d43..73542b873f1e5fae7cdb9bcf9945157cfe2ac035 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 b484d3da7fd4842462f428d052e75ac97e806f14..76c4a04bd04e559e5f9bce90a1e50c0c9e146d35 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 a658b32226b9597506fff2015f2d221c313dd305..ac7bc411c835accc6f26a2edc5501141b1ade470 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 aa6b7ace48c3140067a1d1680fc9544c05de0ce5..f183f7a4406284e8e9b787d8247dda0aa67e176d 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 95326b7c8054275491058968b7da6b3aae9b5a8e..eeaceeabab7cc2cf12a2a699848a93a119965e4e 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 8eee83f811af54b37e715f677eca0506abdbaa11..637f27bcd847187a5bde5d2e1ff25600b4107ad5 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 90ddf815db9b35691af74392e6f55ab53b5226d6..80a61b6fbd11c3f689dff5f767fa7694f1c34eb9 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 f5e55f70184d1faf6df77ed62981e5b3a0da9eaa..722f1a60226e6dbbeee824191eb382f643443260 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 cf8d121aa78dcd8f1164f1715f69951c1facb77b..7c4dc1e67371e6f10c14c0fefea7e09394deae41 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 d187a8a0e8df1273f5946340ad5627b872debffe..7137f9c0d0b3d828257dd725f6db1c9dad5d08e7 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 ab6c1fc51d22b94b4ed9c42afe7e154c9f25bbd0..7c64f804578da7d4a46ae93b27cc6b75fd05d97d 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 49cebe903dc13c27303ff20b660d33b2bdb1dba7..0de60f36eca51dd74533d18ac3eab53c4e017674 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 7844df4ad2c0a48d2dc94f3435b2acd8809fba8c..0791214826cc0b94b6c6fe2bca913a4f8055f4be 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 ec0748cb8340c43a220f76136597c95ea08d8d3d..08b9d185fc8d6c9e58c2133383215c72e2111f48 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 8d08cb8394039f7e082234ac801bad5fa6bbe3d2..056a8b5ffef70b0758a900166d11f7f5658b907f 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 342f8afc0fcac1f72dd54efb135439c0af0ddc87..4dafe771b8ed49e2812db626573a17aa4129c37d 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 90d6ae3af5bf0ca47673943e2b2b694990b09341..6bbdc396d0eb4e7c319dca6c3946eb54deada094 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 4141682a261ba6dc836ea95d3160e8a5e81f123e..fe6ad42ee34261a03d4f53b8f8b6b6205930f9e2 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 c6eb6bcddc20001a0dc855772491c51b6dd8d506..1f5b20d22a2e83857971a481490fb4da5bf92961 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()