diff --git a/flake.lock b/flake.lock index 8a985a3..3479bd9 100644 --- a/flake.lock +++ b/flake.lock @@ -16,12 +16,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681037374, + "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "033b9f258ca96a10e543d4442071f614dc3f8412", "type": "github" }, "original": { @@ -32,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680125544, - "narHash": "sha256-mlqo1r+TZUOuypWdrZHluxWL+E5WzXlUXNZ9Y0WLDFU=", + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", "type": "github" }, "original": { @@ -52,6 +55,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4f410cd..8611fdd 100644 --- a/flake.nix +++ b/flake.nix @@ -31,12 +31,20 @@ overrides = pkgs.poetry2nix.overrides.withDefaults ( self: super: { - # pynetbox = super.pynetbox.overridePythonAttrs - # ( - # old: { - # propagatedBuildInputs = [ super.setuptools-scm ] ++ super.pynetbox.propagatedBuildInputs; - # } - # ); + pynetbox = super.pynetbox.overridePythonAttrs + ( + old: { + patches = old.patches or [ ] ++ [ + ( + pkgs.fetchpatch { + name = "pkg-resources.patch"; + url = "https://github.com/jcollie/pynetbox/commit/f051085a4051a98565c08b9646d5b2d69fe1739e.patch"; + hash = "sha256-lxjc0lG34N5vFu6TnDvrxw0eXI+yf4kqHs7MNuVq7mc="; + } + ) + ]; + } + ); # pathspec = super.pathspec.overridePythonAttrs # ( # old: { @@ -51,10 +59,10 @@ let python = pkgs.python311.withPackages ( ps: with ps; [ - poetry-core + # poetry-core ] ); - project = "netbox-maintenance"; + project = "hostapps"; prompt = ( bash.build_prompt bash.ansi_normal_blue diff --git a/hostapps/run.py b/hostapps/run.py index 87200c8..70f43ab 100644 --- a/hostapps/run.py +++ b/hostapps/run.py @@ -62,7 +62,6 @@ def main( address: str, port: int, ): - sys.stdout.write("\033]0;") sys.stdout.write(name) sys.stdout.write(" - ") diff --git a/poetry.lock b/poetry.lock index aede38b..5ca1a0e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.4.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand. [[package]] name = "black" @@ -41,7 +41,6 @@ mypy-extensions = ">=0.4.3" packaging = ">=22.0" pathspec = ">=0.9.0" platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] @@ -202,6 +201,24 @@ files = [ {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, ] +[[package]] +name = "isort" +version = "5.12.0" +description = "A Python utility / library to sort Python imports." +category = "dev" +optional = false +python-versions = ">=3.8.0" +files = [ + {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, + {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, +] + +[package.extras] +colors = ["colorama (>=0.4.3)"] +pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] +plugins = ["setuptools"] +requirements-deprecated-finder = ["pip-api", "pipreqs"] + [[package]] name = "mccabe" version = "0.7.0" @@ -327,18 +344,6 @@ urllib3 = ">=1.21.1,<1.27" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] - [[package]] name = "urllib3" version = "1.26.15" @@ -358,5 +363,5 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "2.0" -python-versions = "^3.10" -content-hash = "3b36e0371a4223bd1b08eff0e94c8308a69f7b43b8e559be240c5fa03dd2b9a6" +python-versions = "^3.11" +content-hash = "be202e0dd7703973286c9c9a958fb953bfea81bf3e222016e9a7ac125cbd75f1" diff --git a/pyproject.toml b/pyproject.toml index 7983b78..123aa76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,18 +5,24 @@ description = "" authors = ["Jeffrey C. Ollie "] [tool.poetry.dependencies] -python = "^3.10" +python = "^3.11" pynetbox = "^7.0.1" click = "^8.1.3" [tool.poetry.group.dev.dependencies] black = "^23.3.0" flake8 = "^6.0.0" +isort = "^5.12.0" [tool.poetry.scripts] hostapps-update = "hostapps.update:main" hostapps-run = "hostapps.run:main" +[tool.isort] +profile = "black" +force_single_line = true +from_first = false +force_sort_within_sections = true [build-system] requires = ["poetry-core>=1.0.0"]