This commit is contained in:
Reid 'arrdem' McKenzie 2023-07-06 22:55:26 -06:00
parent 8bd01b82a4
commit 27cdc9a06b
6 changed files with 11 additions and 13 deletions

View file

@ -4,9 +4,9 @@ import json
from json.decoder import JSONDecodeError from json.decoder import JSONDecodeError
import logging import logging
import socket import socket
from typing import Union
from urllib.parse import urlparse from urllib.parse import urlparse
import uuid import uuid
from typing import Union
from Crypto.Hash import SHA, SHA256, SHA512 from Crypto.Hash import SHA, SHA256, SHA512
from Crypto.PublicKey import RSA from Crypto.PublicKey import RSA
@ -16,10 +16,8 @@ from aiohttp.client_exceptions import (
ClientConnectorError, ClientConnectorError,
ClientResponseError, ClientResponseError,
) )
from aiohttp.hdrs import METH_ALL as METHODS
from aiohttp.web import ( from aiohttp.web import (
Response as AiohttpResponse, Response as AiohttpResponse,
View as AiohttpView,
) )
from async_lru import alru_cache from async_lru import alru_cache
from relay.http_debug import http_debug from relay.http_debug import http_debug
@ -330,7 +328,7 @@ class DotDict(dict):
def jsonify(self): def jsonify(self):
def _xform(v): def _xform(v):
if hasattr(v, 'jsonify'): if hasattr(v, "jsonify"):
return v.jsonify() return v.jsonify()
else: else:
return v return v

View file

@ -1,5 +1,5 @@
from typing import Union, Optional
import datetime import datetime
from typing import Optional, Union
from .key import KEY from .key import KEY
from .lru import LRU from .lru import LRU

View file

@ -1,6 +1,8 @@
from os import path from os import path
from setuptools import setup from setuptools import setup
here = path.abspath(path.dirname(__file__)) here = path.abspath(path.dirname(__file__))
with open(path.join(here, "README.md"), encoding="utf-8") as f: with open(path.join(here, "README.md"), encoding="utf-8") as f:
@ -28,7 +30,7 @@ setup(
"proquint", "proquint",
], ],
entry_points = { entry_points = {
'console_scripts': ['proquint=proquint.__main__:main'], "console_scripts": ["proquint=proquint.__main__:main"],
}, },
package_dir={"": "src/python"}, package_dir={"": "src/python"},
python_requires=">=3.9", python_requires=">=3.9",

View file

@ -8,9 +8,8 @@ from pprint import pprint
from gandi.client import GandiAPI from gandi.client import GandiAPI
import meraki import meraki
import yaml
from updater import * from updater import *
import yaml
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(

View file

@ -2,9 +2,10 @@
import re import re
import pytest from updater import (
diff_zones,
from updater import RECORD_LINE_PATTERN, parse_zone_record, diff_zones RECORD_LINE_PATTERN,
)
def test_record_pattern(): def test_record_pattern():

View file

@ -16,13 +16,11 @@ def inventory():
@inventory.command("config") @inventory.command("config")
def inventory_config(): def inventory_config():
"""Show the configured inventory plugins.""" """Show the configured inventory plugins."""
pass
@inventory.command("show") @inventory.command("show")
def inventory_show(): def inventory_show():
"""Evaluate host inventory data & display that configuration.""" """Evaluate host inventory data & display that configuration."""
pass
@cli.group("config") @cli.group("config")