Merge pull request #9330 from ThomasWaldmann/remove-check-python-master

Remove some checks (master)

Author: ThomasWaldmann

src/borg/archiver/__init__.py

@@ -40,7 +40,7 @@
     from ..helpers import format_file_size
     from ..helpers import remove_surrogates, text_to_json
     from ..helpers import DatetimeWrapper, replace_placeholders
-    from ..helpers import check_python, check_extension_modules
+
     from ..helpers import is_slow_msgpack, is_supported_msgpack, sysinfo
     from ..helpers import signal_handler, raising_signal_handler, SigHup, SigTerm
     from ..helpers import ErrorIgnoringTextIOWrapper
@@ -455,10 +455,7 @@ def parse_args(self, args=None):
         return args
 
     def prerun_checks(self, logger, is_serve):
-        if not is_serve:
-            # this is the borg *client*, we need to check the python:
-            check_python()
-        check_extension_modules()
+
         selftest(logger)
 
     def _setup_implied_logging(self, args):

src/borg/chunkers/__init__.py

@@ -4,8 +4,6 @@
 from .fixed import ChunkerFixed
 from .reader import *  # noqa
 
-API_VERSION = "1.2_01"
-
 
 def get_chunker(algo, *params, **kw):
     key = kw.get("key", None)

src/borg/chunkers/buzhash.pyi

@@ -2,8 +2,6 @@ from typing import List, Iterator, BinaryIO
 
 from .reader import fmap_entry
 
-API_VERSION: str
-
 def buzhash(data: bytes, seed: int) -> int: ...
 def buzhash_update(sum: int, remove: int, add: int, len: int, seed: int) -> int: ...
 

src/borg/chunkers/buzhash.pyx

@@ -1,6 +1,6 @@
 # cython: language_level=3
 
-API_VERSION = '1.2_01'
+
 
 import cython
 import time

src/borg/chunkers/buzhash64.pyi

@@ -2,8 +2,6 @@ from typing import List, Iterator, BinaryIO
 
 from .reader import fmap_entry
 
-API_VERSION: str
-
 def buzhash64(data: bytes, key: bytes) -> int: ...
 def buzhash64_update(sum: int, remove: int, add: int, len: int, key: bytes) -> int: ...
 def buzhash64_get_table(key: bytes) -> List[int]: ...

src/borg/chunkers/buzhash64.pyx

@@ -1,6 +1,6 @@
 # cython: language_level=3
 
-API_VERSION = '1.2_01'
+
 
 import cython
 import time

src/borg/chunkers/failing.py

@@ -1,5 +1,3 @@
-API_VERSION = "1.2_01"
-
 import os
 import errno
 from typing import BinaryIO, Iterator

src/borg/chunkers/fixed.py

@@ -1,6 +1,5 @@
 from typing import Iterator, BinaryIO
 
-API_VERSION = "1.2_01"
 
 import time
 

src/borg/chunkers/reader.pyi

@@ -1,7 +1,5 @@
 from typing import NamedTuple, Tuple, Dict, List, Any, Type, BinaryIO, Iterator
 
-API_VERSION: str
-
 has_seek_hole: bool
 
 class _Chunk(NamedTuple):

src/borg/chunkers/reader.pyx

@@ -1,6 +1,6 @@
 # cython: language_level=3
 
-API_VERSION = '1.2_01'
+
 
 import os
 import errno