Merge pull request #920 from samschott/drop-py37

Drop support for Python 3.7

pyproject.toml

@@ -22,13 +22,12 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
 ]
 urls = {Homepage = "https://maestral.app"}
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 dependencies = [
     "click>=8.0.2",
     "desktop-notifier>=3.3.0",
     "dropbox>=11.28.0,<12.0",
     "fasteners>=0.15",
-    "importlib_metadata>=3.6",
     "keyring>=22",
     "keyrings.alt>=3.1.0",
     "packaging",
@@ -91,7 +90,7 @@ ignore = "E203,E501,W503,H306"
 statistics = "True"
 
 [tool.mypy]
-python_version = "3.7"
+python_version = "3.8"
 strict = true
 # Disable some strict flags because of untyped dependencies:
 disallow_subclassing_any = false
@@ -101,4 +100,4 @@ ignore_missing_imports = true
 
 [tool.black]
 line-length = 88
-target-version = ["py37", "py38", "py39", "py310", "py311"]
+target-version = ["py38", "py39", "py310", "py311"]

src/maestral/autostart.py

@@ -24,11 +24,7 @@ import sys
 from pathlib import Path
 from enum import Enum
 from typing import Any
-
-try:
-    from importlib.metadata import files, PackageNotFoundError
-except ImportError:  # Python 3.7 and lower
-    from importlib_metadata import files, PackageNotFoundError
+from importlib.metadata import files, PackageNotFoundError
 
 # local imports
 from .utils.appdirs import get_home_dir, get_conf_path, get_data_path

src/maestral/logging.py

@@ -8,24 +8,14 @@ import logging
 import time
 from logging.handlers import RotatingFileHandler
 from collections import deque
-from concurrent.futures import Future
-from typing import Type, Sequence
+from concurrent.futures import Future, InvalidStateError
+from typing import Sequence
 
 from .config import MaestralConfig
 from .utils import sanitize_string
 from .utils.appdirs import get_log_path
 from .utils.integration import SystemdNotifier
 
-InvalidStateError: Type[Exception]
-
-try:
-    from concurrent.futures import (  # type:ignore[attr-defined, no-redef]
-        InvalidStateError,
-    )
-except ImportError:
-    # Python 3.7 and lower
-    InvalidStateError = RuntimeError
-
 
 __all__ = [
     "AwaitableHandler",