From 88badb0e0f1dd371ddd5775e76f6ed5a617c9a85 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 30 Aug 2023 22:07:52 -0500 Subject: [PATCH] update --- flake.lock | 33 +++++++++------------------ flake.nix | 30 ++++++++++++++++--------- poetry.lock | 61 ++++++++++++++++++++++++++++++++++---------------- pyproject.toml | 3 +-- 4 files changed, 73 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index b500eaa..efc6a5f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,40 +89,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693250523, - "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=", + "lastModified": 1693341273, + "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e", + "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1693250523, - "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1693051011, @@ -133,8 +119,9 @@ "type": "github" }, "original": { - "id": "poetry2nix", - "type": "indirect" + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index e9b7a4d..933c603 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { nixpkgs = { - url = "nixpkgs/nixos-unstable"; + url = "nixpkgs/nixos-23.05"; + }; + poetry2nix = { + url = "github:nix-community/poetry2nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; - # poetry2nix = { - # url = "github:nix-community/poetry2nix"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; flake-utils = { url = "github:numtide/flake-utils"; }; @@ -23,7 +23,7 @@ flake-utils.lib.eachDefaultSystem (system: let - # inherit (poetry2nix.legacyPackages.${system}) mkPoetryApplication overrides; + inherit (poetry2nix.legacyPackages.${system}) mkPoetryApplication overrides; pkgs = import nixpkgs { inherit system; }; @@ -64,7 +64,7 @@ ''; }; packages = { - greendeck = pkgs.poetry2nix.mkPoetryApplication { + greendeck = mkPoetryApplication { python = pkgs.python311; projectDir = ./.; groups = [ ]; @@ -77,7 +77,7 @@ 'os.getenv("HIDAPI_LIBRARY")' \ '"${pkgs.hidapi}/lib/libhidapi-libusb.so.0"' ''; - overrides = pkgs.poetry2nix.overrides.withDefaults + overrides = overrides.withDefaults ( self: super: { wand = super.wand.overridePythonAttrs @@ -92,14 +92,24 @@ propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.imagemagickBig ]; } ); + # attrs = super.pydantic-yaml.overridePythonAttrs ( + # old: { + # buildInputs = old.buildInputs ++ [ self.hatchling ]; + # } + # ); + # pytest = super.pytest.overridePythonAttrs ( + # old: { + # buildInputs = [ self.attrs ]; + # } + # ); pydantic-yaml = super.pydantic-yaml.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ super.setuptools ]; + buildInputs = old.buildInputs ++ [ self.setuptools ]; } ); asyncdbus = super.asyncdbus.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ super.setuptools-scm ]; + buildInputs = old.buildInputs ++ [ self.setuptools-scm ]; } ); } diff --git a/poetry.lock b/poetry.lock index cac6d7d..da3d850 100644 --- a/poetry.lock +++ b/poetry.lock @@ -171,6 +171,7 @@ files = [ ] [package.dependencies] +exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" @@ -208,7 +209,11 @@ files = [ [package.dependencies] lazy-object-proxy = ">=1.4.0" -wrapt = {version = ">=1.14,<2", markers = "python_version >= \"3.11\""} +typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""} +wrapt = [ + {version = ">=1.11,<2", markers = "python_version < \"3.11\""}, + {version = ">=1.14,<2", markers = "python_version >= \"3.11\""}, +] [[package]] name = "async-timeout" @@ -293,6 +298,7 @@ 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)"] @@ -456,6 +462,21 @@ files = [ [package.extras] graph = ["objgraph (>=1.7.2)"] +[[package]] +name = "exceptiongroup" +version = "1.1.3" +description = "Backport of PEP 654 (exception groups)" +category = "main" +optional = false +python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.1.3-py3-none-any.whl", hash = "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"}, + {file = "exceptiongroup-1.1.3.tar.gz", hash = "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9"}, +] + +[package.extras] +test = ["pytest (>=6)"] + [[package]] name = "flake8" version = "6.1.0" @@ -486,6 +507,7 @@ files = [ [package.dependencies] Flake8 = ">=5" +TOMLi = {version = "*", markers = "python_version < \"3.11\""} [package.extras] dev = ["pyTest", "pyTest-cov"] @@ -780,21 +802,6 @@ files = [ {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, ] -[[package]] -name = "outcome" -version = "1.2.0" -description = "Capture the outcome of Python function calls." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "outcome-1.2.0-py2.py3-none-any.whl", hash = "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"}, - {file = "outcome-1.2.0.tar.gz", hash = "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672"}, -] - -[package.dependencies] -attrs = ">=19.2.0" - [[package]] name = "packaging" version = "23.1" @@ -1037,10 +1044,14 @@ files = [ [package.dependencies] astroid = ">=2.15.6,<=2.17.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -dill = {version = ">=0.3.6", markers = "python_version >= \"3.11\""} +dill = [ + {version = ">=0.2", markers = "python_version < \"3.11\""}, + {version = ">=0.3.6", markers = "python_version >= \"3.11\""}, +] isort = ">=4.2.5,<6" mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} tomlkit = ">=0.10.1" [package.extras] @@ -1164,6 +1175,18 @@ files = [ {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, ] +[[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 = "tomlkit" version = "0.12.1" @@ -1487,5 +1510,5 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" -python-versions = "^3.11" -content-hash = "2f847f4d1d6846d9e7b10a4d5ce7252c41bdf804892b36052a32b826f2d4ea92" +python-versions = "^3.10" +content-hash = "7b3896f399811c463387ab06195d6afb9839d0f875776ba5f273d0dc40bf7be0" diff --git a/pyproject.toml b/pyproject.toml index 8a16844..aefa482 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ description = "" authors = ["Jeffrey C. Ollie "] [tool.poetry.dependencies] -python = "^3.11" +python = "^3.10" pydantic = "<2" hyperlink = "^21.0.0" websockets = "^11.0.3" @@ -18,7 +18,6 @@ aiopath = "^0.6.11" arrow = "^1.2.3" click = "^8.1.7" asyncdbus = "^0.6.1" -outcome = "^1.2.0" [tool.poetry.scripts] greendeck = "greendeck.main:main"