Commit 00bffb84 authored by pennae's avatar pennae Committed by pennae
Browse files

nixos-render-docs: drop frozendict 

with mypy type checking and Mapping types this is a lot less useful than
anticipated. let's drop it for simplicity and having fewer dependencies.

frozendict 2.3.5 also broke the mypy checks.
parent 27a45b0e

pkgs/tools/nix/nixos-render-docs/default.nix

+9 −12
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ let 
  };



  makeDeps = pkgs: small:

    [ pkgs.frozendict ]

    ++ (

    if small

    then [

      markdown-it-py-no-tests
@@ -34,8 +32,7 @@ let 
    else [

      pkgs.markdown-it-py

      pkgs.mdit-py-plugins

      ]

    );

    ];

in



python.pkgs.buildPythonApplication rec {

pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py

+0 −1
Original line number Diff line number Diff line 
from collections.abc import Mapping, MutableMapping, Sequence

from frozendict import frozendict # type: ignore[attr-defined]

from typing import Any, cast, Optional, NamedTuple



import markdown_it

pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py

+1 −2
Original line number Diff line number Diff line 
from abc import ABC

from collections.abc import Mapping, MutableMapping, Sequence

from frozendict import frozendict # type: ignore[attr-defined]

from typing import Any, Callable, cast, get_args, Iterable, Literal, NoReturn, Optional



import dataclasses
@@ -458,7 +457,7 @@ class Converter(ABC): 
    __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer]



    def __init__(self, manpage_urls: Mapping[str, str]):

        self._manpage_urls = frozendict(manpage_urls)

        self._manpage_urls = manpage_urls



        self._md = markdown_it.MarkdownIt(

            "commonmark",

pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ class DocBookConverter(BaseConverter): 
    __renderer__ = OptionsDocBookRenderer

    __option_block_separator__ = ""



    def __init__(self, manpage_urls: dict[str, str],

    def __init__(self, manpage_urls: Mapping[str, str],

                 revision: str,

                 markdown_by_default: bool,

                 document_type: str,