Unverified Commit 3a9aec46 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #220413 from NixOS/home-assistant 

home-assistant: 2023.3.2 -> 2023.3.3
parents 0f650493 f63f93c0

pkgs/development/python-modules/roombapy/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


buildPythonPackage rec {

  pname = "roombapy";

  version = "1.6.5";

  version = "1.6.6";

  format = "pyproject";



  disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec { 
    owner = "pschmitt";

    repo = "roombapy";

    rev = version;

    sha256 = "sha256-Xjeh29U+FCzI5n/i5s6wC0B88Ktmb8pnNDdOzCiKWi4=";

    hash = "sha256-dfeMd/THlj2HQYcLPmeC3AWP3vR/6+8BFU1QtSu5xg4=";

  };



  nativeBuildInputs = [

pkgs/servers/home-assistant/component-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Do not edit!



{

  version = "2023.3.2";

  version = "2023.3.3";

  components = {

    "3_day_blinds" = ps: with ps; [

    ];

pkgs/servers/home-assistant/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ let 
  extraBuildInputs = extraPackages python.pkgs;



  # Don't forget to run parse-requirements.py after updating

  hassVersion = "2023.3.2";

  hassVersion = "2023.3.3";



in python.pkgs.buildPythonApplication rec {

  pname = "homeassistant";
@@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { 
  # Primary source is the pypi sdist, because it contains translations

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-I6NSVoMS3xbUqh/7BxJj/Evkk7+g3N0dZVJjEbr2pCs=";

    hash = "sha256-AJJ0w66a8D3kiLHhnoFmnGRWyDJ4OCebwwKTGdprGa0=";

  };



  # Secondary source is git for tests
@@ -287,7 +287,7 @@ in python.pkgs.buildPythonApplication rec { 
    owner = "home-assistant";

    repo = "core";

    rev = "refs/tags/${version}";

    hash = "sha256-Qd++/73c9VDNe4AMdiDIVJXxh4qFx2x4HDkY1An2VjE=";

    hash = "sha256-KTmMA8P0MhYAiwp073Q3s60budFKHrsBnAJSqYC7zis=";

  };



  nativeBuildInputs = with python3.pkgs; [
@@ -442,6 +442,7 @@ in python.pkgs.buildPythonApplication rec { 
      python

      supportedComponentsWithTests;

    pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs);

    frontend = python.pkgs.home-assistant-frontend;

    intents = python.pkgs.home-assistant-intents;

    tests = {

      nixos = nixosTests.home-assistant;

pkgs/servers/home-assistant/frontend.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = "20230306.0";

  version = "20230309.0";

  format = "wheel";



  src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec { 
    pname = "home_assistant_frontend";

    dist = "py3";

    python = "py3";

    hash = "sha256-E/e1XyhwFiNMLz7+o99eG9sW2ZCCfPFnkBcu3BpCbxQ=";

    hash = "sha256-gHc93xKIm0LDQrkTtlMdLv/N2smfYz5lQ6uLV+Cqj+s=";

  };



  # there is nothing to strip in this package

pkgs/servers/home-assistant/parse-requirements.py

+17 −10
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs packaging rich ])

#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ attrs packaging rich ])" -p nodePackages.pyright ruff isort"

#

# This script downloads Home Assistant's source tarball.

# Inside the homeassistant/components directory, each integration has an associated manifest.json,
@@ -25,8 +25,9 @@ import tarfile 
import tempfile

from functools import reduce

from io import BytesIO

from typing import Dict, Optional, Set, Any

from typing import Any, Dict, List, Optional, Set

from urllib.request import urlopen



from packaging import version as Version

from rich.console import Console

from rich.table import Table
@@ -45,17 +46,21 @@ PKG_PREFERENCES = { 
}





def run_mypy() -> None:

    cmd = ["mypy", "--ignore-missing-imports", __file__]



def run_sync(cmd: List[str]) -> None:

    print(f"$ {' '.join(cmd)}")

    subprocess.run(cmd, check=True)

    process = subprocess.run(cmd)



    if process.returncode != 0:

        sys.exit(1)





def get_version():

def get_version() -> str:

    with open(os.path.dirname(sys.argv[0]) + "/default.nix") as f:

        # A version consists of digits, dots, and possibly a "b" (for beta)

        m = re.search('hassVersion = "([\\d\\.b]+)";', f.read())

        return m.group(1)

        if match := re.search('hassVersion = "([\\d\\.b]+)";', f.read()):

            return match.group(1)

        raise RuntimeError("hassVersion not in default.nix")





def parse_components(version: str = "master"):
@@ -74,7 +79,7 @@ def parse_components(version: str = "master"): 
                components_with_tests.append(entry.name)



        sys.path.append(core_path)

        from script.hassfest.model import Integration

        from script.hassfest.model import Integration  # type: ignore

        integrations = Integration.load_dir(

            pathlib.Path(

                os.path.join(core_path, "homeassistant/components")
@@ -270,5 +275,7 @@ def main() -> None: 




if __name__ == "__main__":

    run_mypy()

    run_sync(["pyright", __file__])

    run_sync(["ruff", "--ignore=E501", __file__])

    run_sync(["isort", __file__])

    main()