From 4082a4e50c7a92a042db9cbe904142a225239170 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 15:35:20 +0100 Subject: [PATCH 01/13] python3Packages.brother: 0.1.18 -> 0.2.0 --- pkgs/development/python-modules/brother/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 394021ff2b2..1c261d17305 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -4,16 +4,24 @@ buildPythonPackage rec { pname = "brother"; - version = "0.1.18"; + version = "0.2.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "14fiwhgcgymgqsl9kcfb0597rcjxvdknhwbakpdf0xp2ph6cj266"; + sha256 = "0d984apw73kzd6bid65bqhp26gvvgqjni56nqr0gnb2sv7mknnm8"; }; + # pytest-error-for-skips is not packaged + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --error-for-skips" "" + substituteInPlace setup.py \ + --replace "\"pytest-error-for-skips\"" "" + ''; + propagatedBuildInputs = [ pysnmp ]; From 1f9b9159ec35cc0169968c914a31abc6d2480496 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 15:39:29 +0100 Subject: [PATCH 02/13] python3Packages.pysonos: 0.0.37 -> 0.0.40 --- .../python-modules/pysonos/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 4a0fb1413bb..fdf350bd377 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy3k , xmltodict , requests @@ -9,17 +9,21 @@ # Test dependencies , pytest, pylint, flake8, graphviz , mock, sphinx, sphinx_rtd_theme +, requests-mock }: buildPythonPackage rec { pname = "pysonos"; - version = "0.0.37"; + version = "0.0.40"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "43a046c1c6086500fb0f4be1094ca963f5b0f555a04b692832b2b88ab741824e"; + # pypi package is missing test fixtures + src = fetchFromGitHub { + owner = "amelchio"; + repo = pname; + rev = "v${version}"; + sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; @@ -27,6 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest pylint flake8 graphviz mock sphinx sphinx_rtd_theme + requests-mock ]; checkPhase = '' From d2c2d91c0f4124180602784b948c234067425567 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 16:12:50 +0100 Subject: [PATCH 03/13] python3Packages.zigpy: 0.30.0 -> 0.32.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9a6b0feb3b7..dbc42561db6 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1"; + sha256 = "18grqx1fzh539ccar0865shgd2mnfni65rjj787cq5j5p5rn0yc7"; }; propagatedBuildInputs = [ From 9cd60e0bbdadb3cdd1e5167641eaa755ddc45f2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 16:13:11 +0100 Subject: [PATCH 04/13] python3Packages.zha-quirks: 0.0.51 -> 0.0.53 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 2f3500516cb..3141f666a63 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.51"; + version = "0.0.53"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9"; + sha256 = "16n99r7bjd3lnxn72lfnxg44n7mkv196vdhkw2sf1nq1an4ks1nc"; }; propagatedBuildInputs = [ aiohttp zigpy ]; From 984bc493834da53ad862f7196225d7f7d618654f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 16:24:45 +0100 Subject: [PATCH 05/13] python3Packages.pywilight: 0.0.65 -> 0.0.68 --- pkgs/development/python-modules/pywilight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix index 66bdcca4793..4fa4c0fa854 100644 --- a/pkgs/development/python-modules/pywilight/default.nix +++ b/pkgs/development/python-modules/pywilight/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pywilight"; - version = "0.0.65"; + version = "0.0.68"; src = fetchPypi { inherit pname version; - sha256 = "1bldhg81lal9mbf55ky3gj2ndlplr0vfjp1bamd0mz5d9icas8nf"; + sha256 = "1s1xyw5hkfr4rlni1p9z4941pp1740fsg4a3b23a618hv2p1i4ww"; }; propagatedBuildInputs = [ From db80c8a1dcd48ec46e45cba4a01b8e8213aa79f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 16:26:12 +0100 Subject: [PATCH 06/13] python3Packages.xknx: 0.16.1 -> 0.16.2 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b448f87a2d3..ae9156099c8 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.1"; + version = "0.16.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "0nma0fq67p9c90b6s5v7n4s6j94sdiwqf8rk1k2vfc6nxxn1jfll"; + sha256 = "14cx54ia38ifz7c750i8jxcmnybzwh03ds6hinlwhx8hd2cx9knj"; }; propagatedBuildInputs = [ From ad2b162847a4868a8845c8f2468e2c7a4bf79836 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 16:33:38 +0100 Subject: [PATCH 07/13] python3Packages.emoji: 0.6.0 -> 1.2.0 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index d15185e1447..ce2beb23511 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.6.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e42da4f8d648f8ef10691bc246f682a1ec6b18373abfd9be10ec0b398823bd11"; + sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; }; checkInputs = [ nose ]; From 7938f40c354de69a08e3ddfdd75f984abf872739 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 16:44:27 +0100 Subject: [PATCH 08/13] octoprint: ignore emoji and watchdog version constraints --- pkgs/applications/misc/octoprint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9f229e4821b..af42466d0ea 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -144,7 +144,9 @@ let postPatch = let ignoreVersionConstraints = [ + "emoji" "sentry-sdk" + "watchdog" ]; in '' From 469e773d756612307885495cd592ae51d2442dba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 17:14:23 +0100 Subject: [PATCH 09/13] python3Packages.mpd2: 3.0.3 -> 3.0.4 --- pkgs/development/python-modules/mpd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 031f26c4997..8d17d8b3b0c 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.3"; + version = "3.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn"; + sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs"; }; buildInputs = [ mock ]; From 434bf323aaa82e548fbdc27dbf643982093ba64c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 17:17:43 +0100 Subject: [PATCH 10/13] python3Packages.influxdb-client: 1.13.0 -> 1.14.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index bc2f39ad217..56436cdd0eb 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.13.0"; + version = "1.14.0"; disabled = pythonOlder "3.6"; # requires python version >=3.6 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0g7jhjnag8jx8zbjh6xlqds42alpj87a4dpqc37xqa4ir55m3c2q"; + sha256 = "1qq727gwz5migr3xlqxj57qxv1y52g7xpkdgggz2wz739w5czffd"; }; # makes test not reproducible From 078e37f32422b7433d4056b8a0645235aa035b9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Feb 2021 22:22:21 +0100 Subject: [PATCH 11/13] python3Packages.bt-proximity: 0.0.20180217 -> 0.2 --- pkgs/development/python-modules/bt-proximity/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 8ac1b977f39..584b7b12605 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -3,7 +3,7 @@ buildPythonPackage { pname = "bt-proximity"; - version = "0.0.20180217"; + version = "0.2"; # pypi only has a pre-compiled wheel and no sources src = fetchFromGitHub { @@ -18,6 +18,8 @@ buildPythonPackage { # there are no tests doCheck = false; + pythonImportsCheck = [ "bt_proximity" ]; + meta = with lib; { description = "Bluetooth Proximity Detection using Python"; homepage = "https://github.com/FrederikBolding/bluetooth-proximity"; From f22c637c93229d2c718b086dea06b5960f4f9c75 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Feb 2021 00:54:13 +0100 Subject: [PATCH 12/13] python3Packages.fixerio: 0.1.1 -> 1.0.0-alpha --- .../python-modules/fixerio/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix index 786681df1c8..8605d0f65da 100644 --- a/pkgs/development/python-modules/fixerio/default.nix +++ b/pkgs/development/python-modules/fixerio/default.nix @@ -4,23 +4,20 @@ , requests , pytestCheckHook , httpretty +, responses }: buildPythonPackage rec { pname = "fixerio"; - version = "0.1.1"; + version = "1.0.0-alpha"; src = fetchFromGitHub { owner = "amatellanes"; repo = pname; rev = "v${version}"; - sha256 = "1k9ss5jc7sbpkjd2774vbmvljny0wm2lrc8155ha8yk2048jsaxk"; + sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb"; }; - postPatch = '' - substituteInPlace setup.py --replace "requests==2.10.0" "requests" - ''; - propagatedBuildInputs = [ requests ]; @@ -28,6 +25,17 @@ buildPythonPackage rec { checkInputs = [ httpretty pytestCheckHook + responses + ]; + + disabledTests = [ + # tests require network access + "test_returns_historical_rates_for_symbols_passed_if_both" + "test_returns_historical_rates_for_symbols_passed_in_constructor" + "test_returns_historical_rates_for_symbols_passed_in_method" + "test_returns_latest_rates_for_symbols_passed_in_constructor" + "test_returns_latest_rates_for_symbols_passed_in_method" + "test_returns_latest_rates_for_symbols_passed_in_method_if_both" ]; pythonImportsCheck = [ "fixerio" ]; From 4959e208049799da746a2dbcfba89125c582ed2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Feb 2021 01:17:16 +0100 Subject: [PATCH 13/13] python3Packages.libsoundtouch: 0.4.0 -> 0.8.0 --- .../python-modules/libsoundtouch/default.nix | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index a4f98ffada8..77dcdcaef02 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -1,30 +1,40 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub - -, lib -, pythonOlder +, enum-compat , requests -, enum34 +, websocket_client +, zeroconf +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "libsoundtouch"; - version = "0.4.0"; + version = "0.8.0"; src = fetchFromGitHub { - owner = "CharlesBlonde"; - repo = "libsoundtouch"; - rev = "875074b7a23734021974345b3dc297918e453aa2"; - sha256 = "1psd556j4x77hjxahxxgdgnq2mcd769whvnf0gmwf3jy2svfkqlg"; + owner = "CharlesBlonde"; + repo = "libsoundtouch"; + rev = version; + sha256 = "1wl2w5xfdkrv0qzsz084z2k6sycfyq62mqqgciycha3dywf2fvva"; }; - postPatch = lib.optionalString (! (pythonOlder "3.4")) '' - substituteInPlace setup.py --replace "'enum34>=1.1.6'" "" - ''; + propagatedBuildInputs = [ + requests + enum-compat + websocket_client + zeroconf + ]; - propagatedBuildInputs = [ requests enum34 ]; + checkInputs = [ + pytestCheckHook + ]; - doCheck = false; + disabledTests = [ + # mock data order mismatch + "test_select_content_item" + "test_snapshot_restore" + ]; meta = with lib; { description = "Bose Soundtouch Python library";