From 45efc43a07d61bacdfd3918cb694f1654f499b5d Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 9 Feb 2022 19:54:48 +0200
Subject: [PATCH] Integrate isort.
---
.pre-commit-config.yaml | 6 ++++++
Documents/bin/_vagrant-clean | 6 ++----
Documents/bin/_vagrant-update | 6 ++----
Documents/bin/download-password-db | 1 -
Documents/bin/git-manage | 2 +-
Documents/bin/git-namespace-backup | 5 +++--
Documents/bin/nc-notify | 1 -
Documents/bin/planet | 2 +-
Documents/bin/rcfiles/git.py | 1 +
Documents/bin/rcfiles/github.py | 1 +
Documents/bin/rcfiles/gitlab.py | 2 ++
Documents/bin/urldecode | 1 -
Documents/bin/urlencode | 1 -
13 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f61dcef..4b4d8b7 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 6e01712..4a2606b 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 f2d4e76..2f1f256 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 57f82ab..04894cb 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 69269e4..4b99db8 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 d8a790b..d401704 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 263fa12..0c0e683 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 f83e5f9..b6b3ae4 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 10f8518..45cc5f4 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 e5a137e..bd852e2 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 93cf04b..cede8af 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 b70a62a..9b48c33 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 02a1441..5e6819a 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()))
--
GitLab