From 4e325f535301c657091286594995f5ac9dcb13bf Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Thu, 27 Jul 2023 17:19:09 +0100 Subject: [PATCH] tools/batch-rebase: Use typing instead of lisa._generic FIX Remove use of classes removed from lisa._generic --- tools/batch-rebase | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/batch-rebase b/tools/batch-rebase index 03ec4a489..d5cc3a3d7 100755 --- a/tools/batch-rebase +++ b/tools/batch-rebase @@ -32,9 +32,9 @@ import functools import textwrap import logging import contextlib +import typing from lisa.conf import SimpleMultiSrcConf, KeyDesc, LevelKeyDesc, TopLevelKeyDesc -from lisa._generic import TypedList def info(msg): logging.info(msg) @@ -62,7 +62,7 @@ class BatchRebaseManifest(SimpleMultiSrcConf): ]), LevelKeyDesc('resume', 'Internal state used for resuming after a conflict', [ KeyDesc('conflict-topic', 'Topic where the conflict happened', [str]), - KeyDesc('persistent-refs', 'List of references that needs to be pushed back to the main repo', [TypedList[str]]), + KeyDesc('persistent-refs', 'List of references that needs to be pushed back to the main repo', [typing.Sequence[str]]), LevelKeyDesc('tags', 'Topic branch tags', [ KeyDesc('persistent', 'whether tags should be pushed back or not', [bool]), KeyDesc('suffix', 'suffix to use for tags, or None', [str]), -- GitLab