From 04c63bebc7c2c189e70974c5623aca2a9125368a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 May 2021 03:24:07 +0200 Subject: [PATCH 1/8] python3Packages.autocaptureproxy: init at 1.0.1 --- .../authcaptureproxy/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/authcaptureproxy/default.nix diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix new file mode 100644 index 000000000000..0f1f6d046463 --- /dev/null +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, aiohttp +, beautifulsoup4 +, httpx +, importlib-metadata +, multidict +, typer +, yarl +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "authcaptureproxy"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "alandtse"; + repo = "auth_capture_proxy"; + rev = "v${version}"; + sha256 = "1fbrmh6qa3dm3q3zdxaa0fls94wardbcvnjgwxk686wpjgs1xrs4"; + }; + + postPatch = '' + # https://github.com/alandtse/auth_capture_proxy/issues/14 + substituteInPlace pyproject.toml --replace \ + "poetry.masonry.api" \ + "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + httpx + importlib-metadata + multidict + typer + yarl + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "A proxy to capture authentication information from a webpage"; + homepage = "https://github.com/alandtse/auth_capture_proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ graham33 hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc390b22213f..26c4e0e4616d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -605,6 +605,8 @@ in { auth0-python = callPackage ../development/python-modules/auth0-python { }; + authcaptureproxy = callPackage ../development/python-modules/authcaptureproxy { }; + authheaders = callPackage ../development/python-modules/authheaders { }; authlib = callPackage ../development/python-modules/authlib { }; From 62b190d9b8f4fdab5850239fc7c9062775cac121 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 May 2021 03:25:32 +0200 Subject: [PATCH 2/8] python3Packages.teslajsonpy: 0.11.5 -> 0.18.3 --- .../python-modules/teslajsonpy/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 59af2b33d2b9..750b070804c3 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -1,10 +1,12 @@ { lib , aiohttp +, authcaptureproxy , backoff , beautifulsoup4 , buildPythonPackage , fetchFromGitHub , fetchpatch +, poetry-core , pytest-asyncio , pytestCheckHook , wrapt @@ -12,24 +14,22 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.11.5"; + version = "0.18.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s0IZ1UNldYddaR3zJoYS6ey8Kjxd1fr4fOwf0gNNbow="; + sha256 = "1hdc5gm6dg1vw6qfs3z6mg2m94scrvjphj0lin6pi8n3zqj1h26k"; }; - patches = [ - (fetchpatch { - name = "dont-use-dummpy-module-bs4.patch"; - url = "https://github.com/zabuldon/teslajsonpy/pull/138/commits/f5a788e47d8338c8ebb06d954f802ba1ec614db3.patch"; - sha256 = "0rws7fhxmca8d5w0bkygx8scvzah3yvb3yfhn05qmp73mn3pmcb3"; - }) + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ + authcaptureproxy aiohttp backoff beautifulsoup4 From 777be15ea2d9d91207a0fc4bf474eedf4c82dcdf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 May 2021 03:25:46 +0200 Subject: [PATCH 3/8] python3Packages.bellows: 0.23.1 -> 0.24.0 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 79bcaa91cbe7..7df23d1a25aa 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "sha256-c9rKRmGMlYrzVQmUuM9P3c/Jm4QVM2aBRSZ0OkyrPTY="; + sha256 = "00sa4x1qzv861z9d83lk4lp1g2pqiv9hpawj92w4qn1wnqxbz6rw"; }; prePatch = '' From 3e7776bec2f50c561176fa0ac9c4460588a6f338 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 May 2021 03:26:03 +0200 Subject: [PATCH 4/8] python3Packages.pysonos: 0.0.43 -> 0.0.44 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 308dd4e7f25b..3219bd53ac1f 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.43"; + version = "0.0.44"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OobKlAymXXvQH6m77Uqn2eoTlWgs8EBxYIDFJ5wwMKA="; + sha256 = "108818mkb037zs4ikilrskfppcbmqslsm6zaxmy8pphjh7c299mz"; }; propagatedBuildInputs = [ ifaddr requests xmltodict ]; From 0340b38bff3ecc0c6ebd37fee3c77240ff457915 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 May 2021 03:26:23 +0200 Subject: [PATCH 5/8] python3Packages.simplisafe-python: 9.6.9 -> 9.6.10 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 5b8925b0a4c6..9592d37fed0a 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "9.6.9"; + version = "9.6.10"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "1q5w5pvrgj94bzd5wig79l4hipkfrcdah54rvwyi7b8q46gw77sg"; + sha256 = "0cc5kxxishxhkg1nqmgbh36yxs8yjfynmimzjnaqkqfrs9iq46mr"; }; nativeBuildInputs = [ poetry-core ]; From e9477befb8ed197ae3266d31c623f88f493fd784 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 May 2021 03:28:38 +0200 Subject: [PATCH 6/8] home-assistant: enable tesla component tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 960535b5ec64..c836d85ac9bd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -389,6 +389,7 @@ in with py.pkgs; buildPythonApplication rec { "tasmota" "tcp" "template" + "tesla" "threshold" "time_date" "timer" From 9a1c696e3ad6d4d22272cda37584be083c290dc9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 May 2021 15:23:22 +0200 Subject: [PATCH 7/8] python3Packages.yeelight: 0.6.1 -> 0.6.2 Update license to BSD 2-clause. --- pkgs/development/python-modules/yeelight/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 9d435c1cce6b..41ad75c59883 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-LB7A8E22hyqhVBElrOwtC3IPNkyQkU7ZJ1ScqaXQ6zs="; + sha256 = "0v0i0s8d5z6b63f2sy42wf85drdzrzswlm1hknzr7v6lfr52pwwm"; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for controlling YeeLight RGB bulbs"; homepage = "https://gitlab.com/stavros/python-yeelight/"; - license = licenses.asl20; + license = licenses.bsd2; maintainers = with maintainers; [ nyanloutre ]; }; } From e0ec4f7847299b94ef2eb62c4da5bd6ee36a8bfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 May 2021 20:09:45 +0200 Subject: [PATCH 8/8] python3Packages.pysmappee: 0.2.24 -> 0.2.25 --- pkgs/development/python-modules/pysmappee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index c845f1bf5f0d..c053e5592282 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.24"; + version = "0.2.25"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "sha256-M1qzwGf8q4WgkEL0nK1yjn3JSBbP7mr75IV45Oa+ypM="; + sha256 = "0ld3pb86dq61fcvr6zigdz1vjjcwf7izzkajyg82nmb508a570d7"; }; propagatedBuildInputs = [