diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index cea8a2b14cc2..b91ad368f4be 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -505,6 +505,7 @@ in { "mysensors" "nad" "numato" + "otbr" "rflink" "rfxtrx" "scsgate" diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 470a600810bb..d0add0b62eba 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.6.0"; + version = "13.6.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M/KgQFt603V9wzd3SGexjDU7YWwStzVPZOoMBwp52/I="; + hash = "sha256-S2a5v4OeE0DC9J2JAHFQ6YyhWt6RXp3cP+zkONp+Bzc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index c2c625b4f408..94b12357ad39 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.2"; + version = "2.6.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FqZYJoNaRISuZ5m5ZeeregPdBT4fh8NdcgzEho0ZWd0="; + hash = "sha256-bVvz5ruc1OpRnSKso3XHAnppnN/4ySfRHodE787eLFw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index db3a77e8a9b1..42e89147d686 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "45"; + version = "46"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VwuZj0TBc8BBO6ZxpIAR0s0hrOI1muiT4AsDZ+xZPcI="; + hash = "sha256-M6N7KTFYmtjmRSiIYummn2GbO3XemQzCEW+6GVXq9ZI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index dda3d35f6add..cc58e3d6eeb4 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -1,10 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, python, pythonAtLeast }: buildPythonPackage rec { pname = "asynctest"; version = "0.13.0"; - disabled = pythonOlder "3.5"; + # Unmaintained and incompatible python 3.11 + disabled = pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 621f8ef5b2cc..a39cce656a21 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.10"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-eD9E/NbM3t1kWhPwY2SmjuCk+XVwklm4rwzISlQHtq0="; + hash = "sha256-LxIIaxrDWRdYV3K2Geuz0gdDEzqMzYN1tXvjIkQxQoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 1dfb731f9f0a..19be27891f4e 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-o6rCxSJtWqcHqcrhKaVSxEfFLDBikUU9jAszRjihM2o="; + hash = "sha256-bkJhVMcQifNWT/TkUDR2xHlKFHf0lydHdRMQotZWeCM="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/bimmerconnected/bimmer_connected/releases/tag/${version}"; description = "Library to read data from the BMW Connected Drive portal"; homepage = "https://github.com/bimmerconnected/bimmer_connected"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 6b9dbe3093a8..8f027f0e0ca5 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.0.0"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zBZDfUOmy2stIW3Ldm/VN/2G66vg4Lj6kdJCBwo885Y="; + hash = "sha256-mJQ3Y6o6HAqnktsPVuD9ebGgJo0BjSnlDTyqTpNPb1M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 3dc133fefcc7..aa1f879b94bd 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.19.5"; + version = "0.20.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KKZrp5yNuslEPn/TS4eAOMT48C4A5Da5/NhklyFcy7M="; + hash = "sha256-8QFcoWKF2Hc49xJ+224lYaPpTVF1QsMu6Lu66J5ok0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 71e8f9d29dd1..ae0a4f131e2a 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "brother"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bp4YerSTTsuWX3Yc+btlhwCNZO3eDxRgKNzLZFJbKV0="; + hash = "sha256-f55daLPBepNDIfZFAZWdkAvEkNb0cyYQt9LkqyIMrnY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index aaa0a6cc0d23..297dbbd8af90 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.29"; + version = "0.5.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-iGL2LrjVDj4rmzRe6JEBlZxqk6Zt1JlCsQdo+wYXb+0="; + hash = "sha256-bwoLxE47rLr7KNv0qEHjqKf5PJxBNdkaGLf86diTnKo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 0122599c66e2..7ed70976fedb 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -8,19 +8,23 @@ , pycognito , pytest-aiohttp , pytestCheckHook +, pythonOlder , snitun , warrant }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.61.0"; + version = "0.64.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; - rev = version; - hash = "sha256-KG2eCwGZWVtepJQdsSwFziWsT1AbV6rYWRIO/I/CR8g="; + rev = "refs/tags/${version}"; + hash = "sha256-30Z8KBgcd53Nd9lf39Wt28PaYFcnBZ5LC7B+1cestKM="; }; postPatch = '' @@ -40,18 +44,19 @@ buildPythonPackage rec { warrant ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; - pythonImportsCheck = [ "hass_nabucasa" ]; + pythonImportsCheck = [ + "hass_nabucasa" + ]; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; description = "Python module for the Home Assistant cloud integration"; + changelog = "https://github.com/NabuCasa/hass-nabucasa/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 1c4d884ee0ee..b2d5cc0bd86c 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -13,11 +13,12 @@ , pytest-golden , pytestCheckHook , pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "ical"; - version = "4.2.9"; + version = "4.5.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-p1cvs+xLin2WK2zyqQFd1vWKzt+LU2mpDSieOgA7Qf8="; + hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU="; }; propagatedBuildInputs = [ @@ -44,11 +45,9 @@ buildPythonPackage rec { pytest-benchmark pytest-golden pytestCheckHook + pyyaml ]; - # https://github.com/allenporter/ical/issues/136 - disabledTests = [ "test_all_zoneinfo" ]; - pythonImportsCheck = [ "ical" ]; diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 2d71334eadcb..7c2ca75f3c4b 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aZ10z7xCVWq4V2+jPCybFa5LKGhvtchrwgTVFfxhM+o="; + hash = "sha256-c4IvtTn1pLcPHKPyP0FRv3NOu1+Ie42B/Jkc7ej1Roo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index f336379fc60c..f64a71f9029d 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Mq+mARZQD48M6+9XwzX7V541Jqn/vJMSeiEm5k8/YII="; + hash = "sha256-ziFDSGKJB4wGvEF5x8eFMLVKHORXKkLbqBkAjy7FSX4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index e7e9747d7f85..66891a0bc472 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.3.4"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P/5kCXmUWQ/2yvzu/Pr0XBY8zm3fMMyoapGmdtRmxXo="; + hash = "sha256-K8uMyMNZwe6Zr/Qb98wmTLz2+45bx7cmoApnUW5oNPw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix deleted file mode 100644 index 4117c5adf241..000000000000 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildPythonPackage, lib, fetchPypi -, requests -, nose -, responses -}: - -buildPythonPackage rec { - pname = "python-forecastio"; - version = "1.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0m6lf4a46pnwm5xg9dnmwslwzrpnj6d9agw570grciivbvb1ji0l"; - - }; - - nativeCheckInputs = [ nose ]; - - propagatedBuildInputs = [ requests responses ]; - - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://zeevgilovitz.com/python-forecast.io/"; - description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API"; - license = licenses.bsd2; - maintainers = with maintainers; [ makefu ]; - }; -} diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 0caf9f85e3e9..a41a6fcc2b2e 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -15,6 +15,7 @@ , home-assistant-chip-clusters # optionals +, cryptography , home-assistant-chip-core # tests @@ -26,16 +27,16 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-nNf0Q3J5nrYDinMnl+p3HC4FYMX+GubYmtchfuATWms="; + hash = "sha256-T2DB3oWePYR8qKfUeVDMUA5JGdMk/onbpjBt2fWhCuw="; }; nativeBuildInputs = [ @@ -53,6 +54,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { server = [ + cryptography home-assistant-chip-core ]; }; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index b99cc3cf8e53..6c51cb5de092 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -7,12 +7,13 @@ , fetchFromGitHub , pytest-aiohttp , pytestCheckHook +, pythonAtLeast , pythonOlder }: buildPythonPackage rec { pname = "snitun"; - version = "0.33.0"; + version = "0.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6aLvNw5/I5UvTRFzUK93YruKarM8S+gHIYd4hyTp/Qs="; + hash = "sha256-7UGsziNUI4dxdMGuJWrvsQiwl+IvcO/rQqEOjl9wS1Y="; }; propagatedBuildInputs = [ @@ -42,6 +43,9 @@ buildPythonPackage rec { "test_snitun_single_runner_throttling" # ConnectionResetError: [Errno 54] Connection reset by peer "test_peer_listener_timeout" + ] ++ lib.optional (pythonAtLeast "3.11") [ + # TypeError: Passing coroutines is forbidden, use tasks explicitly. + "test_snitun_runner_updown" ]; pythonImportsCheck = [ "snitun" ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index d887287e91d4..3e9e35edeea8 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - hash = "sha256-GmentEsCJQ9N9kXfy5pbkGXi5CvZfbepdCWab+/fLJc="; + hash = "sha256-esINtvctvgl8AqNwCDVnGU+3j/UzEHqY8H1Rws1kQfs="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous Python client for WLED"; homepage = "https://github.com/frenck/python-wled"; + changelog = "https://github.com/frenck/python-wled/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 671dc47084ca..accd4be9da12 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.47.4"; + version = "0.54.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-ig0AMGNshe0bm7ZOkqV62hEcLeYlHBayMLk2fJQ8Uyo="; + hash = "sha256-rbolWawEbjF46Im/mqyOHpvk+4UojgFIaFoG4jbPwYY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 299fb706fe60..0d778abb6917 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.19.2"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Eu+6I904vwPewQesYtn8cWXoo36fQpa1Bw660tnV+Lw="; + hash = "sha256-P0vlNO6hQ+yVMFCHgLBynZuNabMFO2lx6UiYMH1eU1E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 86fa26af68e9..36f2f47d3086 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.16.2"; + version = "0.17.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-EzdKY/VisMUc/5yHN+7JUz1fDM4mCpk5TyApC24z4CU="; + hash = "sha256-XJsaUDCtaBF8vLyLzZ77h/KpV5aM4+JP8ldie7+b510="; }; buildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/zigpy/zigpy-xbee/releases/tag/${version}"; description = "A library which communicates with XBee radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-xbee"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 4ebe9caa9921..63298091f7d1 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -1,15 +1,13 @@ { lib , async-timeout -, asynctest , buildPythonPackage , coloredlogs , fetchFromGitHub , jsonschema -, pyserial -, pyserial-asyncio , pytest-asyncio , pytest-mock , pytest-timeout +, pytest-xdist , pytestCheckHook , pythonOlder , voluptuous @@ -18,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.3"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,15 +25,18 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s="; + hash = "sha256-pQ1T7MTrL789kd8cbbsjRLUaxd1yHF7sDwow2UksQ7c="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "timeout = 20" "timeout = 300" + ''; + propagatedBuildInputs = [ async-timeout coloredlogs jsonschema - pyserial - pyserial-asyncio voluptuous zigpy ]; @@ -44,9 +45,18 @@ buildPythonPackage rec { pytest-asyncio pytest-mock pytest-timeout + pytest-xdist pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest + ]; + + pytestFlagsArray = [ + # https://github.com/zigpy/zigpy-znp/issues/209 + "--deselect=tests/application/test_joining.py::test_join_device" + "--deselect=tests/application/test_joining.py::test_permit_join" + "--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_zdo" + "--deselect=tests/application/test_requests.py::test_zigpy_request" + "--deselect=tests/application/test_requests.py::test_zigpy_request_failure" + "--deselect=tests/application/test_zdo_requests.py::test_mgmt_nwk_update_req" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index f487cc71b435..343afffe4f07 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.53.2"; + version = "0.54.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-/IUJzMzbNKXQZkhwmoKoafMVw+6rD3Sw/coBLOi4FIk="; + hash = "sha256-5R08fols3LkZknddqProM7ekte9Z4wSh6ao7a99wbIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index d4c1ebea5107..a818987a05b5 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.46.0"; + version = "0.47.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EeQ0gUSDsHIJnp1Oc2Imld4ZFa5maX8xj6GzchHlCoc="; + hash = "sha256-TJXzB6w1Kp2cT3sRMtMyL0Nx3ZEUeaHfL0P+qC88ohU="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 879ecbacc0e4..2dbcb1930a86 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.3.6"; + version = "2023.4.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -629,9 +629,6 @@ "danfoss_air" = ps: with ps; [ pydanfossair ]; - "darksky" = ps: with ps; [ - python-forecastio - ]; "datadog" = ps: with ps; [ datadog ]; @@ -661,12 +658,14 @@ bluetooth-data-tools dbus-fast fnvhash + av hass-nabucasa hassil home-assistant-frontend home-assistant-intents ifaddr janus + numpy pillow psutil-home-assistant pyserial @@ -986,6 +985,8 @@ "escea" = ps: with ps; [ pescea ]; + "esera_onewire" = ps: with ps; [ + ]; "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors @@ -2104,8 +2105,6 @@ fnvhash sqlalchemy ]; - "magicseaweed" = ps: with ps; [ - ]; # missing inputs: magicseaweed "mailbox" = ps: with ps; [ aiohttp-cors ]; @@ -2541,6 +2540,7 @@ nuheat ]; "nuki" = ps: with ps; [ + aiohttp-cors pynuki ]; "numato" = ps: with ps; [ @@ -2685,12 +2685,25 @@ ]; # missing inputs: lightify "otbr" = ps: with ps; [ aiohttp-cors + bellows fnvhash ifaddr + janus + pillow + psutil-home-assistant pyroute2 + pyserial-asyncio + pyserial python-otbr-api + pyudev sqlalchemy zeroconf + zha-quirks + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + zigpy ]; "otp" = ps: with ps; [ pyotp @@ -2902,6 +2915,8 @@ pillow pyzbar ]; + "quadrafire" = ps: with ps; [ + ]; "quantum_gateway" = ps: with ps; [ quantum-gateway ]; @@ -4001,6 +4016,8 @@ "verisure" = ps: with ps; [ vsure ]; + "vermont_castings" = ps: with ps; [ + ]; "versasense" = ps: with ps; [ pyversasense ]; @@ -4030,6 +4047,12 @@ "vlc_telnet" = ps: with ps; [ aiovlc ]; + "voice_assistant" = ps: with ps; [ + aiohttp-cors + hassil + home-assistant-intents + mutagen + ]; "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ @@ -4432,7 +4455,6 @@ "cpuspeed" "crownstone" "daikin" - "darksky" "datadog" "debugpy" "deconz" @@ -4469,6 +4491,7 @@ "ecobee" "econet" "ecowitt" + "edl21" "efergy" "eight_sleep" "elgato" @@ -4527,6 +4550,7 @@ "fritzbox_callmonitor" "fronius" "frontend" + "frontier_silicon" "fully_kiosk" "garages_amsterdam" "gdacs" @@ -4735,6 +4759,7 @@ "network" "nexia" "nextbus" + "nextcloud" "nextdns" "nibe_heatpump" "nightscout" @@ -4752,6 +4777,7 @@ "nut" "nws" "nx584" + "obihai" "octoprint" "omnilogic" "onboarding" @@ -4942,6 +4968,7 @@ "telegram" "telegram_bot" "tellduslive" + "temper" "template" "tesla_wall_connector" "text" @@ -5007,6 +5034,7 @@ "vilfo" "vizio" "vlc_telnet" + "voice_assistant" "voicerss" "volumio" "volvooncall" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 33006a10d7e4..32de7429faf3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -69,15 +69,6 @@ let ]; }); - bimmer-connected = super.bimmer-connected.overridePythonAttrs (oldAttrs: rec { - version = "0.12.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw="; - }; - }); - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "0.33"; src = fetchFromGitHub { @@ -98,15 +89,6 @@ let doCheck = false; }); - gios = super.gios.overridePythonAttrs (oldAttrs: rec { - version = "2.3.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA="; - }; - }); - jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -168,16 +150,6 @@ let }; }); - # https://github.com/home-assistant/core/pull/80931 - pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { - version = "2.5.0"; - src = super.fetchPypi { - pname = "PyJWT"; - inherit version; - hash = "sha256-53q4lICQXYaZhEKsV4jzUzP6hfZQR6U0rcOO3zyI/Ds="; - }; - }); - pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -242,22 +214,6 @@ let inherit version; hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24="; }; - nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ - pytest-xdist - ]); - disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ - "test/aaa_profiling" - "test/ext/mypy" - ]; - }); - - subarulink = super.subarulink.overridePythonAttrs (oldAttrs: rec { - version = "0.7.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-BxnpdZwbnZF1oWcu3jRDeXvcaweOuVk1R79KpMLB02c="; - }; }); # Pinned due to API changes in 0.3.0 @@ -282,16 +238,6 @@ let }; }); - # Pinned due to API changes in 2.0 - vsure = super.vsure.overridePythonAttrs (oldAttrs: rec { - version = "1.8.1"; - src = super.fetchPypi { - pname = "vsure"; - inherit version; - hash = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI="; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -327,7 +273,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.3.6"; + hassVersion = "2023.4.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -343,7 +289,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-4PS6ozyqJddF6Jp9cKRojUtHTTNd3xo2oTDboowQACk="; + hash = "sha256-50zDSXFd9VmPlt5DrKL240AuhF87rXX7ieMJbmIoj/4="; }; # Secondary source is git for tests @@ -351,7 +297,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-+u1kCyIzTQrMvO6slr1YW0kZqkh4QGxUo5ucJzxkfEE="; + hash = "sha256-cel7WtndC/UXUgo9paP2QiSzdpBCo7s570cK8MouVdQ="; }; nativeBuildInputs = with python3.pkgs; [ @@ -425,6 +371,7 @@ in python.pkgs.buildPythonApplication rec { python-slugify pyyaml requests + ulid-transform voluptuous voluptuous-serialize yarl @@ -477,6 +424,8 @@ in python.pkgs.buildPythonApplication rec { "--showlocals" # AssertionError: assert 1 == 0 "--deselect tests/test_config.py::test_merge" + # AssertionError: assert 2 == 1 + "--deselect=tests/helpers/test_translation.py::test_caching" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 2874d2958916..5d78be14190d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230309.1"; + version = "20230405.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-o9NIJHmjr3hQxCNl+DGyIfAfXugn8o9O30B46xqsSXo="; + hash = "sha256-9n/LziR4YJLUK3UKHxWlrxJcr2Dx8ph52j8Xbl7MZ/Y="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 94fe8ef3ffbd..5b9303583405 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.2.28"; + version = "2023.3.29"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents"; rev = "refs/tags/${version}"; - hash = "sha256-u9CLPikht+T9wdQpLELPH/t+pZNcaOfbtfWT6DBwZaw="; + hash = "sha256-wMm2C2C+2+pW5kgMHoYFKpwnOJbS5RwpZK5HiAno0H8="; }; sourceRoot = "source/package"; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 92782c20b5e3..1a8d7e5e5091 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.3.6"; + version = "2023.4.0"; 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-VheYp6uwKAxfSCLF6OCB+VYunHSrmnlqHPM1w5e9KYY="; + hash = "sha256-Gu65PlRjAqKK6BdzNjcHeRy4Cqr6z2o+PRwmDFkSlMA="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 15baefc8ce01..87aacda6f8c3 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -39,25 +39,24 @@ let }; extraDisabledTests = { - roku = [ - # homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska) - "test_services_play_media_audio" + vesync = [ + # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration + "test_async_get_config_entry_diagnostics__single_humidifier" + "test_async_get_device_diagnostics__single_fan" ]; }; extraPytestFlagsArray = { dnsip = [ - # AssertionError: assert == + # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ]; history_stats = [ # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; - logbook = [ - "--deselect tests/components/logbook/test_websocket_api.py::test_recorder_is_far_behind " - ]; modbus = [ + # homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail" ]; modem_callerid = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a6afb78a7564..719fb88362ab 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -220,6 +220,7 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05 python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea6f4d83086f..1dd06b0ea27f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9477,8 +9477,6 @@ self: super: with self; { python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; - python-forecastio = callPackage ../development/python-modules/python-forecastio { }; - python-frontmatter = callPackage ../development/python-modules/python-frontmatter { }; python-gammu = callPackage ../development/python-modules/python-gammu { };