diff options
13 files changed, 68 insertions, 47 deletions
diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index b7fbf9af5dd2..15d3d7ae5617 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2022.10.0"; + version = "2023.04.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,13 +24,12 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; + hash = "sha256-ar2UGSlVukMD5EZsEn7TFfIOovaI+B3Ym+UeGo95oks="; }; postPatch = '' - # https://github.com/bachya/aioambient/pull/97 substituteInPlace pyproject.toml \ - --replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"' + --replace 'websockets = ">=11.0.1"' 'websockets = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 9da8d6f204ba..b25c1fa46ed2 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -32,7 +32,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'transitions = "^0.8.0"' 'transitions = "*"' + --replace 'transitions = "^0.8.0"' 'transitions = "*"' \ + --replace 'websockets = ">=9.0,<11.0"' 'websockets = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 297dbbd8af90..c32c81555d78 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.30"; + version = "0.5.31"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-bwoLxE47rLr7KNv0qEHjqKf5PJxBNdkaGLf86diTnKo="; + hash = "sha256-68pHCsY2smaS1nO+fWN1tXy7VyhXcbYzoGmA1cAN5h4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index a7af6aa70cd4..2e5502966f62 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.36"; + version = "0.28.37"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-UoWeVLsfc8rK3U7zaF8bKXk/XdrgT6F3biNe/UFq/rE="; + hash = "sha256-3SlgYENtyv0JdUwGFpT3lWUDOciAKThYGz/RV8z+tac="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 0d27dc380847..4e74e5666893 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.1.3"; + version = "4.1.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-NfgR+X77cuhXCy55Bx9ecP8vN8zs2coexcnCsQ4SbfU="; + hash = "sha256-LJJyJj1HXNdBBs4hDvkuz74PDHRpeVpwbq0vSfESuXY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 4d4146968cbe..629f5413dff3 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { hash = "sha256-yr8IyAwZ6y2MPTe6bHRW+CIp19R3ZJWHuqdN5qultnQ="; }; + postPatch = '' + substituteInPlace setup.py --replace \ + "websockets>=10,<11;python_version>'3.6'" \ + "websockets>=10,<12;python_version>'3.6'" + ''; + propagatedBuildInputs = [ backoff graphql-core diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 9a7642318aa1..075bf6ba084c 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -2,6 +2,7 @@ , amqtt , buildPythonPackage , fetchFromGitHub +, orjson , paho-mqtt , poetry-core , pytest-asyncio @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "roombapy"; - version = "1.6.7"; + version = "1.6.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,14 +21,24 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-cZoHUup3Znna4Za5twYyua3r03InapzU4c1aRrG6rpo="; + hash = "sha256-z9D9FiE+14/x05AFu3EpBYlAqpDPc5y6S+pLTsSO0cU="; }; + postPatch = '' + # hbmqtt was replaced by amqtt + substituteInPlace tests/test_roomba_integration.py \ + --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" + + substituteInPlace pyproject.toml \ + --replace 'orjson = ">=3.8.7"' 'orjson = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + orjson paho-mqtt ]; @@ -37,12 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # hbmqtt was replaced by amqtt - substituteInPlace tests/test_roomba_integration.py \ - --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" - ''; - disabledTestPaths = [ # Requires network access "tests/test_discovery.py" diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 3a822611d1bd..42af75533dd1 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , cryptography , fetchFromGitHub @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.5"; + version = "0.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lvL/bRHvQvvYqr+qzrWe7dOscYFGVA2OrVt/RPGdmzA="; + hash = "sha256-D2nwzj7uYL/v5Ew2+LfJBLH904Htam4Fa3Gs6t8Hbyo="; }; propagatedBuildInputs = [ @@ -30,7 +29,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest cryptography pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index accd4be9da12..05a20e62693a 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,11 +1,13 @@ { lib , stdenv +, cython , async-timeout , buildPythonPackage , fetchFromGitHub , ifaddr , poetry-core , pytest-asyncio +, pytest-timeout , pythonOlder , pytestCheckHook , setuptools @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.54.0"; + version = "0.56.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,24 +24,24 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-rbolWawEbjF46Im/mqyOHpvk+4UojgFIaFoG4jbPwYY="; + hash = "sha256-EglL06umgKjbA7mWuOfss7xemp53XJNOs3eJR5VNWxk="; }; nativeBuildInputs = [ + cython poetry-core setuptools ]; propagatedBuildInputs = [ - async-timeout ifaddr + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; - # OSError: [Errno 48] Address already in use - doCheck = !stdenv.isDarwin; - nativeCheckInputs = [ pytest-asyncio + pytest-timeout pytestCheckHook ]; @@ -48,17 +50,12 @@ buildPythonPackage rec { ''; disabledTests = [ - # tests that require network interaction + # OSError: [Errno 19] No such device "test_close_multiple_times" + "test_integration_with_listener_ipv6" "test_launch_and_close" "test_launch_and_close_context_manager" "test_launch_and_close_v4_v6" - "test_launch_and_close_v6_only" - "test_integration_with_listener_ipv6" - # Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')] - "test_service_browser_expire_callbacks" - ] ++ lib.optionals stdenv.isDarwin [ - "test_lots_of_names" ]; __darwinAllowLocalNetworking = true; @@ -71,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; description = "Python implementation of multicast DNS service discovery"; - homepage = "https://github.com/jstasiak/python-zeroconf"; + homepage = "https://github.com/python-zeroconf/python-zeroconf"; license = licenses.lgpl21Only; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f87d36298003..b6fef9fc8e0e 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.95"; + version = "0.0.96"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-LCO4jLwPqPDOoKdzay7cKuAv36UZ+OGu39AoBj6iqpY="; + hash = "sha256-GqKQPOP3cJe4UyE5OsLCjNVPT8YKsJ0q8ApsJsAk4uw="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a8576f117672..b0d56acfc1fc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.4.1"; + version = "2023.4.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index dbca73d35ee3..359d7c1d1a47 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -109,6 +109,11 @@ let }; }); + # moto tests are a nuissance + moto = super.moto.overridePythonAttrs (_: { + doCheck = false; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -208,11 +213,11 @@ let }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.6"; + version = "2.0.9"; src = super.fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24="; + hash = "sha256-lXGSFePscze59Xw8LtoOanYZvhlKUWbAfB5Zn2r8IPo="; }; }); @@ -249,6 +254,16 @@ let }; }); + websockets = super.websockets.overridePythonAttrs (oldAttrs: rec { + version = "11.0.1"; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = "websockets"; + rev = "refs/tags/${version}"; + hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90="; + }; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -273,7 +288,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.4.1"; + hassVersion = "2023.4.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -289,7 +304,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-p9dR8q9eWxDGo+cBXO0zd9MFdB7pFeAfLfudHsYxcK8="; + hash = "sha256-Fl8CxHK8Gg4wf+kyptyiLZx8MG/eI5kTr+pSLEl729I="; }; # Secondary source is git for tests @@ -297,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-TSTn2o37XMmcU4XCPCMwvRNWW7BUadcfbK7NU/ulsNE="; + hash = "sha256-XCxFi7ts4KQdKl68YP4Ps60SWW22NoNuoGFo50xbl8s="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 1a8d7e5e5091..1dca06b1043b 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.4.0"; + version = "2023.4.2"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-Gu65PlRjAqKK6BdzNjcHeRy4Cqr6z2o+PRwmDFkSlMA="; + hash = "sha256-FzcgGyYtmU8owlvUfP/D+Y6m5QwOWj4njoLTZX6skLE="; }; nativeBuildInputs = [ |