From 741f2f0c97b7480af57a50d8c66f4e2a88275677 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 10 Oct 2022 17:31:38 -0500 Subject: [PATCH] update --- flake.nix | 11 +++++++++++ poetry.lock | 19 +------------------ pyproject.toml | 1 - 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 053406b..a01ff0a 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,17 @@ propagatedBuildInputs = [ pkgs.openssh ]; + overrides = pkgs.poetry2nix.overrides.withDefaults + ( + self: super: { + pynetbox = super.pynetbox.overridePythonAttrs + ( + old: { + propagatedBuildInputs = [ super.setuptools-scm ] ++ super.pynetbox.propagatedBuildInputs; + } + ); + } + ); }; defaultPackage = self.packages.${system}.hostapps; devShells.default = diff --git a/poetry.lock b/poetry.lock index b2ce461..e379f65 100644 --- a/poetry.lock +++ b/poetry.lock @@ -160,19 +160,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 = "setuptools" -version = "65.4.1" -description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] - [[package]] name = "six" version = "1.16.0" @@ -205,7 +192,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "2b1375bf6daa561e06b4b5374e5b7f038809a13e278f03d16c672c7871463c43" +content-hash = "3bcf38cbd013b8a7dcbd3ed2f4f431c3a34f4719bb840d08b04c56a4c50be57c" [metadata.files] black = [ @@ -287,10 +274,6 @@ requests = [ {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, ] -setuptools = [ - {file = "setuptools-65.4.1-py3-none-any.whl", hash = "sha256:1b6bdc6161661409c5f21508763dc63ab20a9ac2f8ba20029aaaa7fdb9118012"}, - {file = "setuptools-65.4.1.tar.gz", hash = "sha256:3050e338e5871e70c72983072fe34f6032ae1cdeeeb67338199c2f74e083a80e"}, -] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, diff --git a/pyproject.toml b/pyproject.toml index 9076d2d..464ecd8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,6 @@ authors = ["Jeffrey C. Ollie "] python = "^3.10" pynetbox = "^6.6.2" click = "^8.1.3" -setuptools = "^65.4.1" [tool.poetry.dev-dependencies] black = "^22.3.0"