From 6720ab3aab57f94437afaf47f84d62cb086eebe1 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 2 Jan 2024 20:39:14 +0100 Subject: [PATCH 1/2] move conftest.py to src/borg/testsuite, see #6386 there, it will be packaged and installed, so that when one runs the testsuite after installing the pypi package, it will find the conftest.py. --- conftest.py => src/borg/testsuite/conftest.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conftest.py => src/borg/testsuite/conftest.py (100%) diff --git a/conftest.py b/src/borg/testsuite/conftest.py similarity index 100% rename from conftest.py rename to src/borg/testsuite/conftest.py From e1fbd7d42e27eeff2bcc53bf74507f118cc1a7d9 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 2 Jan 2024 20:57:42 +0100 Subject: [PATCH 2/2] fix mypy complaints --- src/borg/testsuite/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/borg/testsuite/conftest.py b/src/borg/testsuite/conftest.py index 557f8da03..7fb26f590 100644 --- a/src/borg/testsuite/conftest.py +++ b/src/borg/testsuite/conftest.py @@ -1,5 +1,5 @@ import os -from typing import Optional +from typing import Optional, List import pytest @@ -89,7 +89,7 @@ def set_env_variables(): class ArchiverSetup: EXE: str = None # python source based FORK_DEFAULT = False - BORG_EXES = [] + BORG_EXES: List[str] = [] def __init__(self): self.archiver = None