Various release related minor updates

Author: rogerbinns

apsw/shell.py

@@ -2210,7 +2210,7 @@ def command_load(self, cmd):
         except Exception:
             if len(cmd) == 1:
                 if cmd[0] == "--list":
-                    extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text())
+                    extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text(encoding="utf8"))
                     for name, extra in sorted(extras.items()):
                         if extra["type"] == "extension" and apsw.sqlite_extra.has(name):
                             self.write_value(name, fmt = str)

apsw/sqlite_extra.py

@@ -46,7 +46,7 @@ def path(name:str):
 _exts = ("", ".so", ".dll", ".exe", ".dylib")
 
 def _get_entry(name: str):
-    extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text())
+    extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text(encoding="utf8"))
     if name not in extras:
         raise LookupError(f"{name=} is not a known extra")
     bin_dir = importlib.resources.files(apsw).joinpath("sqlite_extra_binaries")
@@ -83,7 +83,7 @@ def usage():
             usage()
 
         case "--list":
-            extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text())
+            extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text(encoding="utf8"))
             for name in extras:
                 try:
                     extra, path = _get_entry(name)

apsw/tests/async_meta.py

@@ -35,7 +35,7 @@ def get_meta(
 ) -> Literal["sync" | "async" | "dual" | "value"]:
     assert kind in {"function", "attribute"}
 
-    data = json.loads(importlib.resources.files("apsw.tests").joinpath("async_meta.json").read_text())
+    data = json.loads(importlib.resources.files("apsw.tests").joinpath("async_meta.json").read_text(encoding="utf8"))
 
     assert klass in data, f"{klass} not found"
 

apsw/tests/extratest.py

@@ -19,7 +19,7 @@
 
 class Extra(unittest.TestCase):
     def setUp(self):
-        self.extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text())
+        self.extras = json.loads(importlib.resources.files(apsw).joinpath("sqlite_extra.json").read_text(encoding="utf8"))
         self.verbose: bool = self._outcome.result.showAll
 
     def testLoadExtension(self):
@@ -32,7 +32,8 @@ def testLoadExtension(self):
                         print(f"  >> Extension {name}")
                     fn_before = set(row[0] for row in db.execute("select name from pragma_function_list"))
                     vfs_before = set(apsw.vfs_names())
-                    mod_before = set(row[0] for row in db.execute("SELECT name FROM pragma_module_list"))
+                    # some builds have sqlite_stmt builtin so we won't detect it
+                    mod_before = set(row[0] for row in db.execute("SELECT name FROM pragma_module_list WHERE name NOT IN ('sqlite_stmt')"))
                     col_before = set(row[0] for row in db.execute("SELECT name FROM pragma_collation_list"))
                     apsw.sqlite_extra.load(db, name)
                     fn_after = set(db.execute("select name from pragma_function_list").get)

setup.py

@@ -157,15 +157,17 @@ class run_tests(Command):
     # and forces verbose to 0)
     user_options = [
         ("show-tests", "v", "Show each test being run"),
+        ("fail-fast", "f", "Stop on first test failure"),
         ("locals", None, "Show local variables in test failure"),
     ]
 
     # see if you can find boolean_options documented anywhere
-    boolean_options = ["show-tests", "locals"]
+    boolean_options = ["show-tests", "fail-fast", "locals"]
 
     def initialize_options(self):
         self.show_tests = 0
         self.locals = False
+        self.fail_fast = False
 
     def finalize_options(self):
         pass
@@ -178,7 +180,7 @@ def run(self):
         suite = unittest.TestLoader().loadTestsFromModule(apsw.tests.__main__)
         # verbosity of zero doesn't print anything, one prints a dot
         # per test and two prints each test name
-        result = unittest.TextTestRunner(verbosity=self.show_tests + 1, tb_locals=self.locals).run(suite)
+        result = unittest.TextTestRunner(verbosity=self.show_tests + 1, failfast=self.fail_fast, tb_locals=self.locals).run(suite)
         if not result.wasSuccessful():
             sys.exit(1)
 

tools/megatest.py

@@ -64,13 +64,13 @@ def dotest(pyver, logdir, pybin, pylib, workdir, sqlitever, debug, config, gil):
             venv/bin/python3 {pyflags} setup.py fetch --version={sqlitever} --all
             venv/bin/python3 tools/vend.py compile -v
             venv/bin/python3 {pyflags} setup.py build_test_extension build_ext --inplace --force \
-                {extdebug} {build_ext_flags} test -v --locals;"""
+                {extdebug} {build_ext_flags} test -vf --locals"""
         + (
             """
             cp tools/setup-pypi.cfg setup.apsw ;
             venv/bin/python3 -m pip wheel -v . ;
             venv/bin/python3 -m pip install --no-index --force-reinstall --find-links=. apsw ;
-            venv/bin/python3 -m apsw.tests --locals"""
+            venv/bin/python3 -m apsw.tests -vf --locals"""
             if not debug
             else ""
         )
@@ -240,9 +240,9 @@ def cmp(a, b):
     "3.15.0a6",
     "3.14.3",
     "3.13.12",
-    "3.12.12",
-    "3.11.14",
-    "3.10.19",
+    "3.12.13",
+    "3.11.15",
+    "3.10.20",
     "system",
 )