Drop Python 3.8 and 3.9 support, add Python 3.13

- Bump version to 1.5.0.dev
- Update requires-python from >=3.8 to >=3.10
- Update classifiers in pyproject.toml
- Update tox envlist and gh-actions configuration
- Update GitHub Actions workflow matrix
- Update pyupgrade to use --py310-plus
- Remove unused typing imports (Dict, List, Optional, Tuple) now that Python 3.10+ built-in generics are available
- Update changelog with version 1.5.0 release notes

Author: jugmac00

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -39,8 +39,8 @@ jobs:
         run: "python -m tox"
 
       - name: "Report to coveralls"
-        # coverage is only created in the py39 environment
-        if: "matrix.python-version == '3.9'"
+        # coverage is only created in the py311 environment
+        if: "matrix.python-version == '3.12'"
         run: |
           pip install coveralls
           coveralls --service=github

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
     rev: v3.19.0
     hooks:
     - id: pyupgrade
-      args: [--py36-plus]
+      args: [--py310-plus]
 
   - repo: https://github.com/mgedmin/check-python-versions
     rev: 0.22.1

CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.5.0 (unreleased)
+------------------
+- drop support for Python 3.8 and 3.9
+- add support for Python 3.13
+
 1.4.1 (unreleased)
 ------------------
 - migrate from setup.py to pyproject.toml configuration

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Flask-Reuploaded"
-version = "1.4.1.dev"
+version = "1.5.0.dev"
 description = "Flexible and efficient upload handling for Flask"
 license = {text = "MIT"}
 authors = [
@@ -13,7 +13,7 @@ authors = [
 maintainers = [
     {name = "Jürgen Gmach", email = "juergen.gmach@googlemail.com"},
 ]
-requires-python = ">= 3.8"
+requires-python = ">= 3.10"
 dynamic = ["readme"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -22,11 +22,10 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Framework :: Flask",

src/flask_uploads/extensions.py

@@ -1,6 +1,6 @@
 """Extension presets and extension configuration."""
 import os
-from typing import Iterable
+from collections.abc import Iterable
 from typing import cast
 
 # This contains archive and compression formats (.gz, .bz2, .zip, .tar,

src/flask_uploads/flask_uploads.py

@@ -13,12 +13,9 @@
 import os
 import os.path
 import posixpath
+from collections.abc import Callable
+from collections.abc import Iterable
 from typing import Any
-from typing import Callable
-from typing import Dict
-from typing import Iterable
-from typing import Optional
-from typing import Tuple
 from typing import Union
 
 from flask import Blueprint
@@ -45,7 +42,7 @@ def addslash(url: str) -> str:
 def config_for_set(
         uset: 'UploadSet',
         app: Flask,
-        defaults: Optional[Dict[str, Optional[str]]] = None
+        defaults: dict[str, str | None] | None = None
 ) -> 'UploadConfiguration':
     """
     This is a helper function for `configure_uploads` that extracts the
@@ -146,20 +143,20 @@ class UploadConfiguration:
     def __init__(
             self,
             destination: str,
-            base_url: Optional[str] = None,
-            allow: Union[Tuple[()], Tuple[str, ...]] = (),
-            deny: Union[Tuple[()], Tuple[str, ...]] = ()
+            base_url: str | None = None,
+            allow: tuple[()] | tuple[str, ...] = (),
+            deny: tuple[()] | tuple[str, ...] = ()
     ) -> None:
         self.destination = destination
         self.base_url = base_url
         self.allow = allow
         self.deny = deny
 
     @property
-    def tuple(self) -> Tuple[
-        str, Optional[str],
-        Union[Tuple[()], Tuple[str, ...]],
-        Union[Tuple[()], Tuple[str, ...]]
+    def tuple(self) -> tuple[
+        str, str | None,
+        tuple[()] | tuple[str, ...],
+        tuple[()] | tuple[str, ...]
     ]:
         return (self.destination, self.base_url, self.allow, self.deny)
 
@@ -193,13 +190,13 @@ def __init__(
         self,
         name: str = 'files',
         extensions: Iterable[str] = DEFAULTS,
-        default_dest: Optional[Callable[[Flask], str]] = None
+        default_dest: Callable[[Flask], str] | None = None
     ) -> None:
         if not name.isalnum():
             raise ValueError("Name must be alphanumeric (no underscores)")
         self.name = name
         self.extensions = extensions
-        self._config: Optional[UploadConfiguration] = None
+        self._config: UploadConfiguration | None = None
         self.default_dest = default_dest
 
     @property
@@ -238,7 +235,7 @@ def url(self, filename: str) -> str:
         else:
             return base + filename
 
-    def path(self, filename: str, folder: Optional[str] = None) -> str:
+    def path(self, filename: str, folder: str | None = None) -> str:
         """
         This returns the absolute path of a file uploaded to this set. It
         doesn't actually check whether said file exists.
@@ -288,8 +285,8 @@ def get_basename(self, filename: str) -> str:
     def save(
         self,
         storage: FileStorage,
-        folder: Optional[str] = None,
-        name: Optional[str] = None
+        folder: str | None = None,
+        name: str | None = None
     ) -> str:
         """This saves the `storage` into this upload set.
 

src/flask_uploads/test_helper.py

@@ -7,7 +7,6 @@
 """
 from typing import Any
 from typing import BinaryIO
-from typing import Optional
 
 from werkzeug.datastructures import FileStorage
 
@@ -32,12 +31,12 @@ class TestingFileStorage(FileStorage):
     """
     def __init__(
         self,
-        stream: Optional[BinaryIO] = None,
-        filename: Optional[str] = None,
-        name: Optional[str] = None,
+        stream: BinaryIO | None = None,
+        filename: str | None = None,
+        name: str | None = None,
         content_type: str = 'application/octet-stream',
         content_length: int = -1,
-        headers: Optional[Any] = None
+        headers: Any | None = None
     ) -> None:
         super().__init__(
             stream,

tests/test_flask_reuploaded.py

@@ -6,8 +6,6 @@
 
 import os
 import os.path
-from typing import Dict
-from typing import List
 from unittest.mock import Mock
 from unittest.mock import patch
 
@@ -82,7 +80,7 @@ def teardown_method(self) -> None:
 
     def configure(
         self, *sets: 'UploadSet', **options: str
-    ) -> Dict[str, UploadConfiguration]:
+    ) -> dict[str, UploadConfiguration]:
         self.app.config.update(options)
         configure_uploads(self.app, sets)
         return self.app.upload_set_config  # type: ignore
@@ -306,7 +304,7 @@ def test_file_not_allowed(self) -> None:
 @patch("os.makedirs", Mock(return_value=None))
 class TestConflictResolution:
     def setup_method(self) -> None:
-        self.extant_files: List[str] = []
+        self.extant_files: list[str] = []
         self.old_exists = os.path.exists
         os.path.exists = self.exists  # type: ignore
 

tox.ini

@@ -1,10 +1,9 @@
 [tox]
 envlist =
-    py38,
-    py39,
     py310,
     py311,
     py312,
+    py313,
     lint,
     mypy,
     coverage,
@@ -56,11 +55,10 @@ python_classes = Test[A-Z]*
 
 [gh-actions]
 python =
-    3.8: py38, mypy
-    3.9: py39, coverage
-    3.10: py310, pre-commit
+    3.10: py310
     3.11: py311
-    3.12: py312
+    3.12: py312, mypy, coverage, pre-commit
+    3.13: py313
 
 [testenv:docs]
 description = generate docs in HTML format