Unverified Commit eff9c8e1 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents 5f804619 5f3454ba

lib/systems/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ rec { 
        else if final.isLoongArch64 then "loongarch"

        else final.parsed.cpu.name;



      # https://source.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106

      ubootArch =

        if      final.isx86_32 then "x86"    # not i386

        else if final.isMips64 then "mips64" # uboot *does* distinguish between mips32/mips64

        else final.linuxArch;                # other cases appear to agree with linuxArch



      qemuArch =

        if final.isAarch32 then "arm"

        else if final.isS390 && !final.isS390x then null

maintainers/maintainer-list.nix

+18 −0
Original line number Diff line number Diff line
@@ -4866,6 +4866,12 @@ 
    githubId = 50854;

    name = "edef";

  };

  edeneast = {

    email = "edenofest@gmail.com";

    github = "edeneast";

    githubId = 2746374;

    name = "edeneast";

  };

  ederoyd46 = {

    email = "matt@ederoyd.co.uk";

    github = "ederoyd46";
@@ -12964,6 +12970,11 @@ 
    githubId = 585547;

    name = "Jaka Hudoklin";

  };

  offsetcyan = {

    github = "offsetcyan";

    githubId = 49906709;

    name = "Dakota";

  };

  oida = {

    email = "oida@posteo.de";

    github = "oida";
@@ -17720,6 +17731,13 @@ 
    githubId = 25440339;

    name = "Tom Repetti";

  };

  trevdev = {

    email = "trev@trevdev.ca";

    matrix = "@trevdev:matrix.org";

    github = "trev-dev";

    githubId = 28788713;

    name = "Trevor Richards";

  };

  trevorj = {

    email = "nix@trevor.joynson.io";

    github = "akatrevorjay";

nixos/lib/test-driver/default.nix

+10 −10
Original line number Diff line number Diff line
@@ -4,19 +4,20 @@ 
, qemu_pkg ? qemu_test

, coreutils

, imagemagick_light

, libtiff

, netpbm

, qemu_test

, socat

, ruff

, tesseract4

, vde2

, extraPythonPackages ? (_ : [])

}:



python3Packages.buildPythonApplication rec {

python3Packages.buildPythonApplication {

  pname = "nixos-test-driver";

  version = "1.1";

  src = ./.;

  format = "pyproject";



  propagatedBuildInputs = [

    coreutils
@@ -31,14 +32,13 @@ python3Packages.buildPythonApplication rec { 
    ++ extraPythonPackages python3Packages;



  doCheck = true;

  nativeCheckInputs = with python3Packages; [ mypy pylint black ];

  nativeCheckInputs = with python3Packages; [ mypy ruff black ];

  checkPhase = ''

    mypy --disallow-untyped-defs \

          --no-implicit-optional \

          --pretty \

          --no-color-output \

          --ignore-missing-imports ${src}/test_driver

    pylint --errors-only --enable=unused-import ${src}/test_driver

    black --check --diff ${src}/test_driver

    echo -e "\x1b[32m## run mypy\x1b[0m"

    mypy test_driver extract-docstrings.py

    echo -e "\x1b[32m## run ruff\x1b[0m"

    ruff .

    echo -e "\x1b[32m## run black\x1b[0m"

    black --check --diff .

  '';

}

nixos/lib/test-driver/extract-docstrings.py

+25 −17
Original line number Diff line number Diff line 
import ast

import sys

from pathlib import Path



"""

This program takes all the Machine class methods and prints its methods in
@@ -40,10 +41,13 @@ some_function(param1, param2) 


"""



assert len(sys.argv) == 2



with open(sys.argv[1], "r") as f:

    module = ast.parse(f.read())

def main() -> None:

    if len(sys.argv) != 2:

        print(f"Usage: {sys.argv[0]} <path-to-test-driver>")

        sys.exit(1)



    module = ast.parse(Path(sys.argv[1]).read_text())



    class_definitions = (node for node in module.body if isinstance(node, ast.ClassDef))
@@ -55,12 +59,16 @@ function_definitions = [ 
    ]

    function_definitions.sort(key=lambda x: x.name)



for f in function_definitions:

    docstr = ast.get_docstring(f)

    for function in function_definitions:

        docstr = ast.get_docstring(function)

        if docstr is not None:

        args = ", ".join((a.arg for a in f.args.args[1:]))

            args = ", ".join(a.arg for a in function.args.args[1:])

            args = f"({args})"



        docstr = "\n".join((f"    {l}" for l in docstr.strip().splitlines()))

            docstr = "\n".join(f"    {line}" for line in docstr.strip().splitlines())



            print(f"{function.name}{args}\n\n:{docstr[1:]}\n")





        print(f"{f.name}{args}\n\n:{docstr[1:]}\n")
 
if __name__ == "__main__":

    main()

nixos/lib/test-driver/pyproject.toml

0 → 100644
+44 −0
Original line number Diff line number Diff line 
[build-system]

requires = ["setuptools"]

build-backend = "setuptools.build_meta"



[project]

name = "nixos-test-driver"

version = "0.0.0"



[project.scripts]

nixos-test-driver = "test_driver:main"

generate-driver-symbols = "test_driver:generate_driver_symbols"



[tool.setuptools.packages]

find = {}



[tool.setuptools.package-data]

test_driver = ["py.typed"]



[tool.ruff]

line-length = 88



select = ["E", "F", "I", "U", "N"]

ignore = ["E501"]



# xxx: we can import https://pypi.org/project/types-colorama/ here

[[tool.mypy.overrides]]

module = "colorama.*"

ignore_missing_imports = true



[[tool.mypy.overrides]]

module = "ptpython.*"

ignore_missing_imports = true



[tool.black]

line-length = 88

target-version = ['py39']

include = '\.pyi?$'



[tool.mypy]

python_version = "3.10"

warn_redundant_casts = true

disallow_untyped_calls = true

disallow_untyped_defs = true

no_implicit_optional = true