Merge pull request #1125 from reef-technologies/master

Drop python 3.8, use test commons from b2sdk

Author: olzhasar-reef

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "ubuntu-24.04-arm", "macos-latest", "windows-latest"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.9", "pypy3.10"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.9", "pypy3.10"]
         exclude:
           - os: "macos-latest"
             python-version: "pypy3.10"
@@ -118,7 +118,7 @@ jobs:
         run: nox -vs integration -p ${{ matrix.python-version }} -- -m "not require_secrets"
       - name: Run integration tests (with secrets)
         # Limit CI workload by running integration tests with secrets only on edge Python versions.
-        if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' && contains(fromJSON('["3.8", "pypy3.10", "3.14"]'), matrix.python-version) }}
+        if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' && contains(fromJSON('["3.9", "pypy3.10", "3.14"]'), matrix.python-version) }}
         run: nox -vs integration -p ${{ matrix.python-version }} -- -m "require_secrets" --cleanup
   test-docker:
     timeout-minutes: 90

.gitignore

@@ -18,4 +18,5 @@ doc/source/main_help.rst
 doc/source/subcommands
 Dockerfile
 b2/licenses_output.txt
-*.spec
+*.spec
+.env

CONTRIBUTING.md

@@ -63,7 +63,7 @@ With `nox`, you can run different sessions (default are `lint` and `test`):
 
 * `format` -> Format the code.
 * `lint` -> Run linters.
-* `test` (`test-3.8`, `test-3.9`, `test-3.10`, `test-3.11`) -> Run test suite.
+* `test` (`test-3.9`, `test-3.10`, `test-3.11`) -> Run test suite.
 * `cover` -> Perform coverage analysis.
 * `build` -> Build the distribution.
 * `generate_dockerfile` -> generate dockerfile

b2/_internal/_cli/argcompleters.py

@@ -61,12 +61,11 @@ def b2uri_file_completer(prefix: str, parsed_args, **kwargs):
     from b2sdk.v3 import LIST_FILE_NAMES_MAX_LIMIT, unprintable_to_hex
 
     from b2._internal._cli.b2api import _get_b2api_for_profile
-    from b2._internal._utils.python_compat import removeprefix
     from b2._internal._utils.uri import parse_b2_uri
 
     api = _get_b2api_for_profile(getattr(parsed_args, 'profile', None))
     if prefix.startswith('b2://'):
-        prefix_without_scheme = removeprefix(prefix, 'b2://')
+        prefix_without_scheme = prefix.removeprefix('b2://')
         if '/' not in prefix_without_scheme:
             return [
                 f'b2://{unprintable_to_hex(bucket.name)}/'

b2/_internal/_cli/b2args.py

@@ -14,7 +14,7 @@
 import argparse
 import functools
 from os import environ
-from typing import Optional, Tuple, Union
+from typing import Optional, Union
 
 from b2._internal._cli.arg_parser_types import wrap_with_argument_type_error
 from b2._internal._cli.argcompleters import b2uri_file_completer, bucket_name_completer
@@ -242,5 +242,5 @@ def add_b2id_or_file_like_b2_uri_or_bucket_name_argument(
     return arg
 
 
-def get_keyid_and_key_from_env_vars() -> Tuple[Optional[str], Optional[str]]:
+def get_keyid_and_key_from_env_vars() -> tuple[Optional[str], Optional[str]]:
     return environ.get(B2_APPLICATION_KEY_ID_ENV_VAR), environ.get(B2_APPLICATION_KEY_ENV_VAR)

b2/_internal/_utils/python_compat.py

@@ -11,9 +11,9 @@
 
 import dataclasses
 import re
+from collections.abc import Sequence
 from functools import singledispatchmethod
 from pathlib import Path
-from typing import Sequence
 
 from b2sdk.v3 import (
     B2Api,

b2/_internal/_utils/uri.py

@@ -17,7 +17,6 @@
 import warnings
 
 from b2._internal._cli.autocomplete_cache import AUTOCOMPLETE  # noqa
-from b2._internal._utils.python_compat import removeprefix
 
 AUTOCOMPLETE.autocomplete_from_cache()
 
@@ -49,7 +48,7 @@
 from concurrent.futures import Executor, Future, ThreadPoolExecutor
 from contextlib import suppress
 from enum import Enum
-from typing import Any, BinaryIO, List
+from typing import Any, BinaryIO
 
 import b2sdk
 import requests
@@ -782,7 +781,7 @@ def _setup_parser(cls, parser):
         super()._setup_parser(parser)
 
     def get_b2_uri_from_arg(self, args: argparse.Namespace) -> B2URI:
-        return B2URI(removeprefix(args.bucketName or '', 'b2://'), args.folderName or '')
+        return B2URI((args.bucketName or '').removeprefix('b2://'), args.folderName or '')
 
 
 class B2IDOrB2URIMixin:
@@ -884,7 +883,7 @@ def _setup_parser(cls, parser):
         add_normalized_argument(
             lifecycle_group,
             '--lifecycle-rules',
-            type=functools.partial(validated_loads, expected_type=List[LifecycleRule]),
+            type=functools.partial(validated_loads, expected_type=list[LifecycleRule]),
             help='(deprecated; use --lifecycle-rule instead) List of lifecycle rules in JSON format.',
         )
 

b2/_internal/console_tool.py

@@ -10,12 +10,11 @@
 
 import pathlib
 import re
-from typing import List
 
 RE_VERSION = re.compile(r'[_]*b2v(\d+)')
 
 
-def get_versions() -> List[str]:
+def get_versions() -> list[str]:
     return [path.name for path in sorted(pathlib.Path(__file__).parent.glob('*b2v*'))]
 
 

b2/_internal/version_listing.py

@@ -0,0 +1 @@
+Use b2sdk pytest plugin and utilities in tests.