Remove Python 3.9 support

Fixes #584

Author: rogerbinns

.github/workflows/build-pypi.yml

@@ -10,11 +10,7 @@ jobs:
       fail-fast: false
       matrix:
        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-14]
-       pyver: [cp39, cp310, cp311, cp312, cp313, cp314, cp314t]
-       exclude:
-         - os: windows-11-arm
-           pyver: cp39
-
+       pyver: [cp310, cp311, cp312, cp313, cp314, cp314t]
 
     steps:
       - uses: actions/checkout@v5

.github/workflows/build-testpypi.yml

@@ -10,11 +10,7 @@ jobs:
       fail-fast: false
       matrix:
        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-14]
-       pyver: [cp39, cp310, cp311, cp312, cp313, cp314, cp314t]
-       exclude:
-         - os: windows-11-arm
-           pyver: cp39
-
+       pyver: [cp310, cp311, cp312, cp313, cp314, cp314t]
 
     steps:
       - uses: actions/checkout@v5

Makefile

@@ -210,8 +210,6 @@ compile-win:  ## Builds and tests against all the Python versions on Windows
 	$(MAKE) compile-win-one PYTHON=c:/python311-32/python
 	$(MAKE) compile-win-one PYTHON=c:/python310-32/python
 	$(MAKE) compile-win-one PYTHON=c:/python310/python
-	$(MAKE) compile-win-one PYTHON=c:/python39-32/python
-	$(MAKE) compile-win-one PYTHON=c:/python39/python
 
 # I did try to make this use venv but then the pip inside the venv and
 # other packages were skipped due to metadata issues

README.rst

@@ -5,7 +5,7 @@
   :target: https://rogerbinns.github.io/apsw/
 
 APSW stands for **A**\ nother **P**\ ython **S**\ QLite **W**\ rapper.   APSW
-supports CPython 3.9 onwards.
+supports CPython 3.10 onwards.
 
 About
 =====

apsw/ext.py

@@ -4,7 +4,6 @@
 
 import abc
 import collections
-import collections.abc
 import contextvars
 import dataclasses
 import enum
@@ -24,12 +23,11 @@
 from dataclasses import dataclass, is_dataclass, make_dataclass
 from fractions import Fraction
 from typing import Any, Callable, Generator, Iterable, Iterator, Literal, Sequence, TextIO, Union
+from types import NoneType
 
 import apsw
 import apsw.unicode
 
-NoneType = types.NoneType if sys.version_info > (3, 10) else type(None)
-
 
 def result_string(code: int) -> str:
     """Turns a result or extended result code into a string.

apsw/fts5.py

@@ -1391,11 +1391,7 @@ def key_tokens(
             for token in self.tokenize(utf8, include_colocated=False, include_offsets=False, locale=locale):
                 token_counter[token] += 1
 
-        try:
-            row_token_count = token_counter.total()
-        except AttributeError:
-            # Py <= 3.9 doesn't have total so do it the hard way
-            row_token_count = sum(token_counter.values())
+        row_token_count = token_counter.total()
 
         # calculate per token score
         scores: list[tuple[float, str]] = []

apsw/fts5query.py

@@ -106,13 +106,8 @@
 import sys
 
 import dataclasses
-from wsgiref.simple_server import sys_version
 
-try:
-    from typing import Union, Any, Sequence, NoReturn, Literal, Iterator, TypeAlias
-except ImportError:
-    # TypeAlias is not in Python <= 3.9
-    pass
+from typing import Union, Any, Sequence, NoReturn, Literal, Iterator, TypeAlias
 
 import apsw
 
@@ -583,15 +578,8 @@ def quote(text: str | QueryTokens) -> str:
     COLUMNFILTER: ("query",),
 }
 
-if sys.version_info >= (3, 10):
-
-    def _is_QUERY(obj):
-        return isinstance(obj, QUERY)
-else:
-    # py 3.9 can't do the above so we always return True.  Providing a
-    # non-query will result in an inscrutable error lower in walk
-    def _is_QUERY(obj):
-        return True
+def _is_QUERY(obj):
+    return isinstance(obj, QUERY)
 
 
 def walk(start: QUERY) -> Iterator[tuple[tuple[QUERY, ...], QUERY]]:

apsw/shell.py

@@ -864,7 +864,7 @@ def handle_exception(self):
         if self.bail:
             raise
 
-    @dataclasses.dataclass(**({"slots": True, "frozen": True} if sys.version_info >= (3, 10) else {}))
+    @dataclasses.dataclass(slots=True, frozen=True)
     class _qd:
         query: str | None
         remaining: str | None
@@ -3464,7 +3464,7 @@ def complete_command(self, line, token, beg, end):
         return [v for v in sorted(completions) if v.startswith(token) and v != token]
 
     ### Output helpers
-    @dataclasses.dataclass(**({"slots": True, "frozen": True} if sys.version_info >= (3, 10) else {}))
+    @dataclasses.dataclass(slots=True, frozen=True)
     class Row:
         "Returned by :class:`Shell.PositionRow`"
 

apsw/tests/__main__.py

@@ -10844,9 +10844,8 @@ def testFunctionFlags(self) -> None:
 
     def testBestPractice(self) -> None:
         "apsw.bestpractice module"
-        if sys.version_info >= (3, 10):
-            with self.assertNoLogs():
-                apsw.log(apsw.SQLITE_NOMEM, "Zebras are striped")
+        with self.assertNoLogs():
+            apsw.log(apsw.SQLITE_NOMEM, "Zebras are striped")
         apsw.bestpractice.apply(apsw.bestpractice.recommended)
         with self.assertLogs() as l:
             apsw.log(apsw.SQLITE_NOMEM, "Zebras are striped")
@@ -10863,14 +10862,12 @@ def testBestPractice(self) -> None:
         con = apsw.Connection("")
         # now fail
         apsw.config(apsw.SQLITE_CONFIG_LOG, None)
-        if sys.version_info >= (3, 10):
-            with self.assertNoLogs():
-                self.assertRaises(apsw.SQLError, con.execute, dqs)
+        with self.assertNoLogs():
+            self.assertRaises(apsw.SQLError, con.execute, dqs)
 
         # can't optimize or WAL readonly databases
-        if sys.version_info >= (3, 10):
-            with self.assertNoLogs():
-                apsw.Connection(self.db.filename, flags=apsw.SQLITE_OPEN_READONLY)
+        with self.assertNoLogs():
+            apsw.Connection(self.db.filename, flags=apsw.SQLITE_OPEN_READONLY)
 
     def testExtTracing(self) -> None:
         "apsw.ext Tracing and Resource usage"
@@ -11224,13 +11221,9 @@ def stuff_namedtuple():
             (stuff_stat_struct, apsw.ext.VTColumnAccess.By_Attr, None),
         ):
             if func is stuff_stat_struct:
-                if sys.version_info < (3, 10):
-                    a = apsw.ext.VTColumnAccess.By_Attr
-                    n = names = tuple(member for member in dir(next(func())) if member.startswith("st_"))
-                else:
-                    n, a = apsw.ext.get_column_names(next(func()))
-                    names = n
-                    self.assertEqual(names, os.stat(".").__match_args__)
+                n, a = apsw.ext.get_column_names(next(func()))
+                names = n
+                self.assertEqual(names, os.stat(".").__match_args__)
             else:
                 n, a = apsw.ext.get_column_names(next(func()))
             self.assertEqual(access, a)
@@ -12104,10 +12097,6 @@ def setup():
     if not getattr(memdb, "enableloadextension", None):
         del APSW.testLoadExtension
 
-    # earlier py versions make recursion error fatal
-    if sys.version_info < (3, 10):
-        del APSW.testIssue425
-
     # Fork checker is becoming less usefull on newer Pythons because
     # multiprocessing really doesn't want you to use fork and does
     # alternate methods instead.  We also run sanitizers on most

apsw/tests/ftstests.py

@@ -31,25 +31,6 @@
 import apsw.fts5query
 import apsw.unicode
 
-try:
-    itertools.pairwise
-except AttributeError:
-    # Py <= 3.9 doesn't have it.  We monkeypatch because only
-    # referenced in this test code
-
-    # from the docs
-    def pairwise(iterable):
-        # pairwise('ABCDEFG') → AB BC CD DE EF FG
-
-        iterator = iter(iterable)
-        a = next(iterator, None)
-
-        for b in iterator:
-            yield a, b
-            a = b
-
-    itertools.pairwise = pairwise
-
 
 class BecauseWindowsTempfile:
     "Work around Windows preventing concurrent access to a file opened for writing"
@@ -1526,8 +1507,7 @@ def mq(s):
         # key tokens
         def token_check(rowid, expected, **kwargs):
             kt = t.key_tokens(rowid, **kwargs)
-            zip_kwargs = {"strict": True} if sys.version_info >= (3, 10) else {}
-            for got, expected in zip(kt, expected, **zip_kwargs):
+            for got, expected in zip(kt, expected, strict=True):
                 # float values
                 self.assertAlmostEqual(got[0], expected[0])
                 self.assertEqual(got[1], expected[1])
@@ -2889,11 +2869,9 @@ def testErrors(self):
 
     def testWalk(self):
         "walk and related functions"
-        if sys.version_info >= (3, 10):
-            # py 3.9 is unable to type check and give a nicer error
-            self.assertRaises(TypeError, list, apsw.fts5query.walk({1: 2}))
-            self.assertRaises(TypeError, apsw.fts5query.extract_with_column_filters, {1: 2}, 1)
-            self.assertRaises(TypeError, apsw.fts5query.applicable_columns, {1: 2}, 2, 3)
+        self.assertRaises(TypeError, list, apsw.fts5query.walk({1: 2}))
+        self.assertRaises(TypeError, apsw.fts5query.extract_with_column_filters, {1: 2}, 1)
+        self.assertRaises(TypeError, apsw.fts5query.applicable_columns, {1: 2}, 2, 3)
 
         def n(v):
             # turns instance into class basename