diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f61dcefae30b7e9b4e9d46a7407a3c4181cf2c7c..4b4d8b71d43f49379d1ee10b6a6418afca474bc9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,6 +30,12 @@ repos: types: [plain-text] exclude: LICENSE + - repo: https://github.com/PyCQA/isort + rev: 5.10.1 + hooks: + - id: isort + args: ["--filter-files", "--profile", "black"] + - repo: https://github.com/ambv/black rev: 21.8b0 hooks: diff --git a/Documents/bin/_vagrant-clean b/Documents/bin/_vagrant-clean index 6e01712ce1c9ccbbe67423d67857ea396a151535..4a2606ba77b68ace80fc15226badfd3d9d6af66d 100755 --- a/Documents/bin/_vagrant-clean +++ b/Documents/bin/_vagrant-clean @@ -3,10 +3,8 @@ """Remove duplicate versions of local Vagrant base boxes.""" # pylint: disable=import-error -from sh import vagrant - from parse import parse - +from sh import vagrant boxes = {} for line in vagrant.box("list"): @@ -22,7 +20,7 @@ for line in vagrant.box("list"): for box in boxes: for provider in boxes[box]: for version in boxes[box][provider][:-1]: - print("Removing box {0} version {1}.".format(box, version)) + print("Removing box {box} version {version}.") vagrant.box( "remove", "--force", diff --git a/Documents/bin/_vagrant-update b/Documents/bin/_vagrant-update index f2d4e76ecbc903862886cbd67df4ad4bd30f67a9..2f1f256e84e2403ae5fc037a0005876a84bee08f 100755 --- a/Documents/bin/_vagrant-update +++ b/Documents/bin/_vagrant-update @@ -3,10 +3,8 @@ """Update local Vagrant base boxes.""" # pylint: disable=import-error -from sh import vagrant - from parse import parse - +from sh import vagrant boxes = {} dummy_providers = ["aws"] @@ -21,5 +19,5 @@ for line in vagrant.box("list"): # pylint: disable=consider-using-dict-items for box in boxes: for provider in boxes[box]: - print("Updating box {0} provider {1}.".format(box, provider)) + print(f"Updating box {box} provider {provider}.") vagrant.box("update", "--provider", provider, "--box", box) diff --git a/Documents/bin/download-password-db b/Documents/bin/download-password-db index 57f82ab49833faa1b136258bd9b452a92e66567f..04894cb0d5fac94a2201b4ed83c78cdef5f1d86c 100755 --- a/Documents/bin/download-password-db +++ b/Documents/bin/download-password-db @@ -13,7 +13,6 @@ import os import os.path import subprocess # nosec - DB_PATH = "Documents/Database.kdbx" DEST = os.path.expanduser(f"~/{ os.path.dirname(DB_PATH) }") SOURCE = f"nextcloud:{DB_PATH}" diff --git a/Documents/bin/git-manage b/Documents/bin/git-manage index 69269e43286ac968360ed9760ad06112d7f259ff..4b99db876987a7b9cec86a00991cb450ff73596a 100755 --- a/Documents/bin/git-manage +++ b/Documents/bin/git-manage @@ -6,6 +6,7 @@ import argparse import os import os.path import sys + import github3.exceptions # pylint: disable=import-error import gitlab.exceptions # pylint: disable=import-error import passhole.passhole # pylint: disable=import-error @@ -17,7 +18,6 @@ import rcfiles.git # noqa: E402 pylint: disable=wrong-import-position import rcfiles.github # noqa: E402 pylint: disable=wrong-import-position import rcfiles.gitlab # noqa: E402 pylint: disable=wrong-import-position - GH_MIRROR_PREFIX = "https://*****@github.com/" diff --git a/Documents/bin/git-namespace-backup b/Documents/bin/git-namespace-backup index d8a790bf66014604959382e20afe5bb99535e88b..d401704c0554a88b4778286a753c719ad07cd8dc 100755 --- a/Documents/bin/git-namespace-backup +++ b/Documents/bin/git-namespace-backup @@ -10,10 +10,11 @@ In this context, a namespace is a directory under ~/Repositories. """ import argparse -import pathlib -import sys import os import os.path +import pathlib +import sys + import gitlab.exception # pylint: disable=import-error import sh # pylint: disable=import-error from sh.contrib import git # pylint: disable=import-error diff --git a/Documents/bin/nc-notify b/Documents/bin/nc-notify index 263fa12c7ac3a7003fac8c080aa9fa6e5750bb20..0c0e6834b3317a800a2bf63672526c9d68a32d62 100755 --- a/Documents/bin/nc-notify +++ b/Documents/bin/nc-notify @@ -10,7 +10,6 @@ import os import sys import urllib.request - if __name__ == "__main__": if os.fork(): sys.exit() diff --git a/Documents/bin/planet b/Documents/bin/planet index f83e5f909da83ecfbe32b157265c9dc8e2fd38af..b6b3ae46ed0ead4f94cdb0e1be5f4a1d4db05401 100755 --- a/Documents/bin/planet +++ b/Documents/bin/planet @@ -5,10 +5,10 @@ import argparse import pathlib import sys import webbrowser + import xdg.BaseDirectory # pylint: disable=import-error import yaml - EXAMPLE_CONFIG = """--- general: # For the list of available browsers, consult diff --git a/Documents/bin/rcfiles/git.py b/Documents/bin/rcfiles/git.py index 10f8518939bec3b4ea2c0d3bff16a724b9a32dde..45cc5f4b86c0b46e9f70b7de37d4d7ec9023d1b9 100644 --- a/Documents/bin/rcfiles/git.py +++ b/Documents/bin/rcfiles/git.py @@ -3,6 +3,7 @@ import configparser import os.path import pathlib + import sh # pylint: disable=import-error from sh.contrib import git # pylint: disable=import-error diff --git a/Documents/bin/rcfiles/github.py b/Documents/bin/rcfiles/github.py index e5a137ef99420f16c575986562ce562ba5adbd65..bd852e2b39e01ebcfe87af8c9bc7b0ce1f17257d 100644 --- a/Documents/bin/rcfiles/github.py +++ b/Documents/bin/rcfiles/github.py @@ -1,6 +1,7 @@ """A bunch of convenience functions to deal with GitHub.""" import os + import github3 # pylint: disable=import-error HTTP_URL = "https://github.com/" diff --git a/Documents/bin/rcfiles/gitlab.py b/Documents/bin/rcfiles/gitlab.py index 93cf04b85f027ced9f826055bb788d636dd9562c..cede8af4fd8f618cfb8e01bbf37350355be89e77 100644 --- a/Documents/bin/rcfiles/gitlab.py +++ b/Documents/bin/rcfiles/gitlab.py @@ -2,8 +2,10 @@ import os import re + import gitlab # pylint: disable=import-error,useless-suppression import gitlab.exceptions # pylint: disable=import-error + from . import git diff --git a/Documents/bin/urldecode b/Documents/bin/urldecode index b70a62aa26a7c4c3d6cef2042b4fa6aa388ad650..9b48c3307f3a5f230c66a880c19efd04ef133dcc 100755 --- a/Documents/bin/urldecode +++ b/Documents/bin/urldecode @@ -3,7 +3,6 @@ import fileinput from urllib.parse import unquote_plus as unquote - if __name__ == "__main__": for line in fileinput.input(): print(unquote(line.strip())) diff --git a/Documents/bin/urlencode b/Documents/bin/urlencode index 02a144142d209b6bbc378ea05c0c99bec7315648..5e6819a99c08372b58ea288fa069945f7ac920e4 100755 --- a/Documents/bin/urlencode +++ b/Documents/bin/urlencode @@ -3,7 +3,6 @@ import fileinput from urllib.parse import quote_plus as quote - if __name__ == "__main__": for line in fileinput.input(): print(quote(line.strip()))