isort the repo

bundles/backup-server/items.py

@@ -1,6 +1,7 @@
 repo.libs.tools.require_bundle(node, 'zfs')
 
 from os.path import join
+
 from bundlewrap.metadata import metadata_to_json
 
 dataset = node.metadata.get('backup-server/zfs-base')

bundles/bird/metadata.py

@@ -1,4 +1,5 @@
 from ipaddress import ip_network
+
 from bundlewrap.exceptions import NoSuchNode
 from bundlewrap.metadata import atomic
 

bundles/icinga2/files/check_freifunk_node

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-from requests import get
 from sys import argv, exit
 
+from requests import get
+
 meshviewer_url = argv[1]
 node_id = argv[2]
 node = None

bundles/icinga2/files/check_sipgate_account_balance

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-from requests import get
 from sys import exit
 
+from requests import get
+
 SIPGATE_USER = '${node.metadata['icinga2']['sipgate_user']}'
 SIPGATE_PASS = '${node.metadata['icinga2']['sipgate_pass']}'
 

bundles/icinga2/files/check_spam_blocklist

@@ -1,12 +1,10 @@
 #!/usr/bin/env python3
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from ipaddress import ip_address, IPv6Address
+from ipaddress import IPv6Address, ip_address
 from subprocess import check_output
 from sys import argv, exit
 
-
-
 BLOCKLISTS = [
     '0spam.fusionzero.com',
     'bl.mailspike.org',

bundles/icinga2/files/scripts/icinga_notification_wrapper

@@ -4,10 +4,11 @@ import email.mime.text
 import smtplib
 from argparse import ArgumentParser
 from json import dumps
-from requests import post
 from subprocess import run
 from sys import argv
 
+from requests import post
+
 SIPGATE_USER='${node.metadata['icinga2']['sipgate_user']}'
 SIPGATE_PASS='${node.metadata['icinga2']['sipgate_pass']}'
 

bundles/matrix-synapse/files/synapse-purge-unused-rooms

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
 from os import environ
-from requests import get, post
 from sys import argv, exit
 
+from requests import get, post
 
 SYNAPSE_MAX_ROOMS_TO_GET = 20000
 SYNAPSE_HOST = 'http://[::1]:20080/'

bundles/mosquitto/files/tasmota-telegraf-plugin

@@ -7,7 +7,6 @@ from time import sleep
 
 import paho.mqtt.client as mqtt
 
-
 BROKER_HOST = argv[1]
 BROKER_TOPIC = argv[2]
 

bundles/mosquitto/metadata.py

@@ -1,6 +1,5 @@
 from bundlewrap.metadata import atomic
 
-
 defaults = {
     'apt': {
         'packages': {

bundles/octoprint/files/check_octoprint_update

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-from requests import get
 from sys import exit
 
+from requests import get
+
 api_key = '${api_key}'
 
 try:

bundles/postfix/files/postfix-telegraf-queue

@@ -4,7 +4,6 @@
 from json import loads
 from subprocess import check_output
 
-
 queue_counts = {}
 
 queue_json = check_output(['sudo', '/usr/sbin/postqueue', '-j'])

bundles/powerdns/metadata.py

@@ -1,4 +1,4 @@
-from ipaddress import ip_address, IPv4Address, IPv6Address
+from ipaddress import IPv4Address, IPv6Address, ip_address
 
 from bundlewrap.metadata import atomic
 

bundles/pppd/files/dyndns

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-import requests
 from sys import argv
 
+import requests
+
 INTERFACE = argv[1]
 LOCAL_IP = argv[4]
 

bundles/pretalx/files/pretalx-administrators-from-group

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
-import psycopg2
 from configparser import ConfigParser
 from sys import argv, exit
 
+import psycopg2
+
 
 def main():
     try:

bundles/rspamd/files/telegraf-rspamd-plugin

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-from requests import get
 from sys import argv, stderr
 
+from requests import get
+
 try:
     r = get('http://127.0.0.1:11334/stat')
     r.raise_for_status()

bundles/smartd/files/telegraf_plugin

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from subprocess import check_output
 from json import loads
+from subprocess import check_output
 from sys import stderr
 
 devices = check_output(['smartctl', '--scan']).decode().splitlines()

bundles/sshmon/files/check_http_wget

@@ -2,8 +2,8 @@
 
 #this is actually a python https requests query, its called check_http_wget cause it got replaced
 
-from sys import exit
 from argparse import ArgumentParser
+from sys import exit
 
 import requests
 

bundles/sshmon/files/check_mounts

@@ -5,7 +5,6 @@ from argparse import ArgumentParser
 from subprocess import check_output
 from tempfile import TemporaryFile
 
-
 check_filesystem_types = {
     'ext2',
     'ext3',

bundles/users/items.py

@@ -1,4 +1,4 @@
-from os.path import join, exists
+from os.path import exists, join
 
 files = {
     '/etc/bash.bashrc': {

bundles/wireguard/metadata.py

@@ -3,7 +3,6 @@ from ipaddress import ip_network
 from bundlewrap.exceptions import NoSuchNode
 from bundlewrap.metadata import atomic
 
-
 defaults = {
     'apt': {
         'packages': {

bundles/zfs/files/check_zpool_space

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
 
+import re
 from subprocess import check_output
 from sys import argv, exit
-import re
 
 
 def to_bytes(size):

bundles/zfs/files/zfs-auto-snapshot

@@ -2,7 +2,6 @@
 
 
 import re
-
 from datetime import datetime
 from json import loads
 from subprocess import check_call, check_output

bundles/zfs/items.py

@@ -1,5 +1,4 @@
 from json import dumps
-#from os.path import join
 
 from bundlewrap.metadata import MetadataJSONEncoder
 

hooks/test_backup_metadata.py

@@ -2,6 +2,7 @@ from bundlewrap.exceptions import BundleError
 from bundlewrap.utils.text import bold, green, yellow
 from bundlewrap.utils.ui import io
 
+
 def test_node(repo, node, **kwargs):
     if not node.has_bundle('backup-client'):
         return

hooks/test_metadata_dashes_vs_underscores.py

@@ -4,6 +4,7 @@ from bundlewrap.exceptions import BundleError
 from bundlewrap.utils.text import bold, green
 from bundlewrap.utils.ui import io
 
+
 def test_underscore_vs_dash(node, metadata, path=[]):
     for k, v in metadata.items():
         if not isinstance(k, str):

libs/faults.py

@@ -1,4 +1,4 @@
-from json import loads, dumps
+from json import dumps, loads
 
 from bundlewrap.metadata import metadata_to_json
 from bundlewrap.utils import Fault

libs/firewall.py

@@ -1,5 +1,5 @@
+from ipaddress import IPv4Network, ip_network
 from os.path import abspath, dirname, join
-from ipaddress import ip_network, IPv4Network
 
 REPO_PATH = dirname(dirname(abspath(__file__)))
 

libs/keys.py

@@ -1,8 +1,11 @@
 import base64
-from nacl.public import PrivateKey
+
 from nacl.encoding import Base64Encoder
+from nacl.public import PrivateKey
+
 from bundlewrap.utils import Fault
 
+
 def gen_privkey(repo, identifier):
     return repo.vault.random_bytes_as_base64_for(identifier)
 

libs/tools.py

@@ -1,9 +1,10 @@
-from ipaddress import ip_address, ip_network, IPv4Address, IPv4Network
+from ipaddress import IPv4Address, IPv4Network, ip_address, ip_network
 
-from bundlewrap.exceptions import NoSuchGroup, NoSuchNode, BundleError
+from bundlewrap.exceptions import BundleError, NoSuchGroup, NoSuchNode
 from bundlewrap.utils.text import bold, red
 from bundlewrap.utils.ui import io
 
+
 def resolve_identifier(repo, identifier):
     """
     Try to resolve an identifier (group or node). Return a set of ip

nodes.py

@@ -3,6 +3,7 @@ from os.path import join
 from pathlib import Path
 
 import bwpass
+
 from bundlewrap.metadata import atomic
 from bundlewrap.utils import error_context
 

scripts/encrypt_file

@@ -5,7 +5,6 @@ from sys import argv
 
 from bundlewrap.repo import Repository
 
-
 path = environ.get('BW_REPO_PATH', '.')
 repo = Repository(path)
 

scripts/list-all-ips

@@ -5,7 +5,6 @@ from sys import argv
 from bundlewrap.repo import Repository
 from bundlewrap.utils.dicts import merge_dict
 
-
 path = environ.get('BW_REPO_PATH', '.')
 repo = Repository(path)
 

scripts/passwords-for

@@ -2,10 +2,9 @@
 from os import environ
 from sys import argv
 
+from bundlewrap.exceptions import FaultUnavailable
 from bundlewrap.repo import Repository
 from bundlewrap.utils import Fault
-from bundlewrap.exceptions import FaultUnavailable
-
 
 path = environ.get('BW_REPO_PATH', '.')
 repo = Repository(path)