Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F32219388
D4107.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
14 KB
Referenced Files
None
Subscribers
None
D4107.diff
View Options
diff --git a/_modules/convert.py b/_modules/convert.py
--- a/_modules/convert.py
+++ b/_modules/convert.py
@@ -12,7 +12,6 @@
import json
import salt.serializers.yaml
-
# -------------------------------------------------------------
# JSON
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/_modules/credentials.py b/_modules/credentials.py
--- a/_modules/credentials.py
+++ b/_modules/credentials.py
@@ -14,7 +14,6 @@
from salt.utils.files import fopen
-
VAULT_PREFIX = "ops/secrets/"
diff --git a/_modules/network_utils.py b/_modules/network_utils.py
--- a/_modules/network_utils.py
+++ b/_modules/network_utils.py
@@ -10,7 +10,6 @@
import re
-
# -------------------------------------------------------------
# CIDR netmask and prefixes
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/_modules/node.py b/_modules/node.py
--- a/_modules/node.py
+++ b/_modules/node.py
@@ -13,7 +13,6 @@
from salt._compat import ipaddress
from collections import OrderedDict
-
DEPLOY_ROLES = [
"devserver",
"salt-primary",
diff --git a/_modules/rabbitmq_api.py b/_modules/rabbitmq_api.py
--- a/_modules/rabbitmq_api.py
+++ b/_modules/rabbitmq_api.py
@@ -18,7 +18,6 @@
import requests
from requests.auth import HTTPBasicAuth
-
log = logging.getLogger(__name__)
diff --git a/_states/rabbitmq.py b/_states/rabbitmq.py
--- a/_states/rabbitmq.py
+++ b/_states/rabbitmq.py
@@ -11,7 +11,6 @@
import logging
-
log = logging.getLogger(__name__)
diff --git a/_tests/helpers.py b/_tests/helpers.py
--- a/_tests/helpers.py
+++ b/_tests/helpers.py
@@ -15,7 +15,6 @@
import yaml
-
# -------------------------------------------------------------
# Import mechanics
#
diff --git a/_tests/modules/test_nano.py b/_tests/modules/test_nano.py
--- a/_tests/modules/test_nano.py
+++ b/_tests/modules/test_nano.py
@@ -5,7 +5,6 @@
import salt_test_case
import nano
-
DATA_DIR = "data/nanorc_dir"
EXPECTED_INCLUDES = [
"include data/nanorc_dir/bar.nanorc",
diff --git a/_tests/pillar/core/test_users.py b/_tests/pillar/core/test_users.py
--- a/_tests/pillar/core/test_users.py
+++ b/_tests/pillar/core/test_users.py
@@ -3,7 +3,6 @@
import unittest
import yaml
-
PILLAR_FILE = "../pillar/core/users.sls"
USER_PROPERTIES_MANDATORY = set(
diff --git a/_tests/pillar/credentials/test_vault.py b/_tests/pillar/credentials/test_vault.py
--- a/_tests/pillar/credentials/test_vault.py
+++ b/_tests/pillar/credentials/test_vault.py
@@ -5,7 +5,6 @@
import unittest
import yaml
-
PILLAR_FILE = "../pillar/credentials/vault.sls"
diff --git a/_tests/pillar/dbserver/test_postgresql.py b/_tests/pillar/dbserver/test_postgresql.py
--- a/_tests/pillar/dbserver/test_postgresql.py
+++ b/_tests/pillar/dbserver/test_postgresql.py
@@ -14,7 +14,6 @@
from helpers import load_pillars
-
# -------------------------------------------------------------
# Connection keys
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/_tests/pillar/paas/test_docker.py b/_tests/pillar/paas/test_docker.py
--- a/_tests/pillar/paas/test_docker.py
+++ b/_tests/pillar/paas/test_docker.py
@@ -5,7 +5,6 @@
import unittest
import yaml
-
PILLAR_PATH = "../pillar/paas/docker/"
diff --git a/_tests/roles/python/dns/test_dns_zones.py b/_tests/roles/python/dns/test_dns_zones.py
--- a/_tests/roles/python/dns/test_dns_zones.py
+++ b/_tests/roles/python/dns/test_dns_zones.py
@@ -21,7 +21,6 @@
from helpers import load_pillars
-
# -------------------------------------------------------------
# Does zone file exist?
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/_tests/scripts/python/test_clear_video_queue.py b/_tests/scripts/python/test_clear_video_queue.py
--- a/_tests/scripts/python/test_clear_video_queue.py
+++ b/_tests/scripts/python/test_clear_video_queue.py
@@ -4,7 +4,6 @@
from helpers import import_from_path
-
script_path = "roles/paas-docker/containers/files/mastodon/clear-video-queue.py"
script = import_from_path("script", script_path)
diff --git a/_tests/scripts/python/test_edit_acme_dns_accounts.py b/_tests/scripts/python/test_edit_acme_dns_accounts.py
--- a/_tests/scripts/python/test_edit_acme_dns_accounts.py
+++ b/_tests/scripts/python/test_edit_acme_dns_accounts.py
@@ -6,7 +6,6 @@
from helpers import import_from_path
-
script_path = "roles/core/certificates/files/certbot/acme-dns/edit-acme-dns-accounts.py"
script = import_from_path("script", script_path)
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
# Linters
autopep8>=2.3.1,<3.0
-black>=24.4.2,<25.0
+black>=26.5.1,<27.0
flake8>=7.1.0,<8.0
pycodestyle>=2.12.0,<3.0
diff --git a/roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py b/roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
--- a/roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
+++ b/roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
@@ -35,7 +35,6 @@
from urllib.error import HTTPError
from urllib.request import urlopen
-
# -------------------------------------------------------------
# Configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/dbserver-pgsql/monitoring/files/check-postgresql-dependencies.py b/roles/dbserver-pgsql/monitoring/files/check-postgresql-dependencies.py
--- a/roles/dbserver-pgsql/monitoring/files/check-postgresql-dependencies.py
+++ b/roles/dbserver-pgsql/monitoring/files/check-postgresql-dependencies.py
@@ -14,7 +14,6 @@
import lddcollect
import sys
-
# -------------------------------------------------------------
# Dependencies
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/dbserver-pgsql/monitoring/files/check-postgresql-xml-support.py b/roles/dbserver-pgsql/monitoring/files/check-postgresql-xml-support.py
--- a/roles/dbserver-pgsql/monitoring/files/check-postgresql-xml-support.py
+++ b/roles/dbserver-pgsql/monitoring/files/check-postgresql-xml-support.py
@@ -13,7 +13,6 @@
import lddcollect
import sys
-
# -------------------------------------------------------------
# Dependencies
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/devserver/api-exec/files/server.py b/roles/devserver/api-exec/files/server.py
--- a/roles/devserver/api-exec/files/server.py
+++ b/roles/devserver/api-exec/files/server.py
@@ -24,7 +24,6 @@
from flask import Flask, Response, abort
import yaml
-
# -------------------------------------------------------------
# Parse configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/devserver/userland-software/files/ccache-metrics.py b/roles/devserver/userland-software/files/ccache-metrics.py
--- a/roles/devserver/userland-software/files/ccache-metrics.py
+++ b/roles/devserver/userland-software/files/ccache-metrics.py
@@ -22,7 +22,6 @@
import subprocess
import time
-
CCACHE_DATE_FORMAT = "%a %b %d %H:%M:%S %Y"
PREFIX = "ccache"
@@ -39,7 +38,7 @@
if not key.endswith("_info"):
metric_key += "_info"
- metric_key += "{path=\"" + value + "\"}"
+ metric_key += '{path="' + value + '"}'
type = "info"
value = 1
elif key.endswith("_rate") or key.endswith("_size") or key == "files_in_cache":
diff --git a/roles/devserver/userland-software/files/install-clang-format-alias.py b/roles/devserver/userland-software/files/install-clang-format-alias.py
--- a/roles/devserver/userland-software/files/install-clang-format-alias.py
+++ b/roles/devserver/userland-software/files/install-clang-format-alias.py
@@ -13,7 +13,6 @@
import os
import sys
-
# -------------------------------------------------------------
# Create clang-format alias
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/devserver/userland-software/files/shell.py b/roles/devserver/userland-software/files/shell.py
--- a/roles/devserver/userland-software/files/shell.py
+++ b/roles/devserver/userland-software/files/shell.py
@@ -23,7 +23,6 @@
import sys
import yaml
-
# -------------------------------------------------------------
# Configuration file locator
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/devserver/userland-software/files/url.py b/roles/devserver/userland-software/files/url.py
--- a/roles/devserver/userland-software/files/url.py
+++ b/roles/devserver/userland-software/files/url.py
@@ -21,7 +21,6 @@
import sys
import yaml
-
# -------------------------------------------------------------
# Exceptions
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/devserver/webserver-home/files/setup-web-home.py b/roles/devserver/webserver-home/files/setup-web-home.py
--- a/roles/devserver/webserver-home/files/setup-web-home.py
+++ b/roles/devserver/webserver-home/files/setup-web-home.py
@@ -12,7 +12,6 @@
import os
import sys
-
# -------------------------------------------------------------
# Web setup
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/mailserver/postfix/files/postfix-to-mailman.py b/roles/mailserver/postfix/files/postfix-to-mailman.py
--- a/roles/mailserver/postfix/files/postfix-to-mailman.py
+++ b/roles/mailserver/postfix/files/postfix-to-mailman.py
@@ -40,7 +40,6 @@
import re
import string
-
# -------------------------------------------------------------
# Configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/monitoring/checks/files/check-github-storage.py b/roles/monitoring/checks/files/check-github-storage.py
--- a/roles/monitoring/checks/files/check-github-storage.py
+++ b/roles/monitoring/checks/files/check-github-storage.py
@@ -13,7 +13,6 @@
import requests
import yaml
-
VAULT_CERTIFICATE = "/usr/local/share/certs/nasqueron-vault-ca.crt"
ORG = "nasqueron"
diff --git a/roles/paas-docker/containers/files/hound/generate-config.py b/roles/paas-docker/containers/files/hound/generate-config.py
--- a/roles/paas-docker/containers/files/hound/generate-config.py
+++ b/roles/paas-docker/containers/files/hound/generate-config.py
@@ -4,7 +4,6 @@
import json
import sys
-
POLL_TIME = 3600000
diff --git a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
--- a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
+++ b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
@@ -18,7 +18,6 @@
import subprocess
-
PS_COLUMN_PID = 0
PS_COLUMN_TIME = 3
PS_COLUMN_COMMAND = 4
diff --git a/roles/paas-docker/containers/files/sentry/etc/sentry.conf.py b/roles/paas-docker/containers/files/sentry/etc/sentry.conf.py
--- a/roles/paas-docker/containers/files/sentry/etc/sentry.conf.py
+++ b/roles/paas-docker/containers/files/sentry/etc/sentry.conf.py
@@ -19,7 +19,6 @@
from sentry.conf.server import * # NOQA
-
# -------------------------------------------------------------
# Helper methods
#
diff --git a/roles/paas-docker/docker/files/docker-paas-list-containers.py b/roles/paas-docker/docker/files/docker-paas-list-containers.py
--- a/roles/paas-docker/docker/files/docker-paas-list-containers.py
+++ b/roles/paas-docker/docker/files/docker-paas-list-containers.py
@@ -20,7 +20,6 @@
import subprocess
import sys
-
CONTAINER_DELIMITERS = [":"]
diff --git a/utils/dump-py-state.py b/utils/dump-py-state.py
--- a/utils/dump-py-state.py
+++ b/utils/dump-py-state.py
@@ -15,7 +15,6 @@
import sys
import yaml
-
# -------------------------------------------------------------
# Pillar helper
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/utils/netbox/build-etc-hosts-drake.py b/utils/netbox/build-etc-hosts-drake.py
--- a/utils/netbox/build-etc-hosts-drake.py
+++ b/utils/netbox/build-etc-hosts-drake.py
@@ -16,7 +16,6 @@
import pynetbox
import yaml
-
VRF_RD_DRAKE = "nasqueron.drake"
diff --git a/utils/netbox/document-hypervisors.py b/utils/netbox/document-hypervisors.py
--- a/utils/netbox/document-hypervisors.py
+++ b/utils/netbox/document-hypervisors.py
@@ -20,7 +20,6 @@
import subprocess
import yaml
-
TAG_VMWARE = "VMWare ESXi"
diff --git a/utils/next-uid.py b/utils/next-uid.py
--- a/utils/next-uid.py
+++ b/utils/next-uid.py
@@ -9,7 +9,6 @@
import yaml
-
USERS_DATASOURCE = "pillar/core/users.sls"
USERS_DATASOURCE_KEY = "shellusers"
USERS_CUT = 5000
diff --git a/utils/nginx/ranges2geo.py b/utils/nginx/ranges2geo.py
--- a/utils/nginx/ranges2geo.py
+++ b/utils/nginx/ranges2geo.py
@@ -10,7 +10,6 @@
import sys
-
# -------------------------------------------------------------
# Formatter for ngx_http_geo_module
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/utils/show-local-states.py b/utils/show-local-states.py
--- a/utils/show-local-states.py
+++ b/utils/show-local-states.py
@@ -13,7 +13,6 @@
import json
import subprocess
-
# -------------------------------------------------------------
# Show state information
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/utils/templates/create.py b/utils/templates/create.py
--- a/utils/templates/create.py
+++ b/utils/templates/create.py
@@ -15,7 +15,6 @@
import yaml
-
ROOT_TEMPLATE_DIR = "_resources/templates"
diff --git a/utils/vault/issue-admin-token.py b/utils/vault/issue-admin-token.py
--- a/utils/vault/issue-admin-token.py
+++ b/utils/vault/issue-admin-token.py
@@ -13,7 +13,6 @@
import yaml
import sys
-
VAULT_TLS_CERTIFICATE_PATH = "/usr/local/share/certs/nasqueron-root-ca.crt"
diff --git a/utils/vault/wordpress-provision-secrets.py b/utils/vault/wordpress-provision-secrets.py
--- a/utils/vault/wordpress-provision-secrets.py
+++ b/utils/vault/wordpress-provision-secrets.py
@@ -18,7 +18,6 @@
import hvac
-
# -------------------------------------------------------------
# WordPress secrets
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Jun 8, 17:18 (23 h, 25 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3796378
Default Alt Text
D4107.diff (14 KB)
Attached To
Mode
D4107: Update Black style
Attached
Detach File
Event Timeline
Log In to Comment