Merge branch 'master' of github.com:rogerbinns/apsw

.github/workflows/build-pypi.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19
+        uses: pypa/cibuildwheel@v2.20
         env:
           CIBW_SKIP: pp*
           CIBW_BEFORE_BUILD: python -c "import shutil ; shutil.copyfile('tools/setup-pypi.cfg','setup.apsw')"
@@ -42,7 +42,7 @@ jobs:
             platforms: all
 
         - name: Build wheels
-          uses: pypa/cibuildwheel@v2.19
+          uses: pypa/cibuildwheel@v2.20
           env:
             CIBW_SKIP: pp*
             CIBW_ARCHS_LINUX: ${{ matrix.arch }}

.github/workflows/build-testpypi.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19
+        uses: pypa/cibuildwheel@v2.20
         env:
           CIBW_SKIP: pp*
           CIBW_BEFORE_BUILD: python -c "import shutil ; shutil.copyfile('tools/setup-pypi.cfg','setup.apsw')"
@@ -42,7 +42,7 @@ jobs:
             platforms: all
 
         - name: Build wheels
-          uses: pypa/cibuildwheel@v2.19
+          uses: pypa/cibuildwheel@v2.20
           env:
             CIBW_SKIP: pp*
             CIBW_ARCHS_LINUX: ${{ matrix.arch }}

Makefile

@@ -1,8 +1,8 @@
 
-SQLITEVERSION=3.46.0
-APSWSUFFIX=.1
+SQLITEVERSION=3.46.1
+APSWSUFFIX=.0
 
-RELEASEDATE="17 June 2024"
+RELEASEDATE="13 August 2024"
 
 VERSION=$(SQLITEVERSION)$(APSWSUFFIX)
 VERDIR=apsw-$(VERSION)
@@ -178,6 +178,8 @@ compile-win:  ## Builds and tests against all the Python versions on Windows
 	-cmd /c del /s /q build
 	-cmd /c del /s /q .venv
 	-cmd /c md dist
+	$(MAKE) compile-win-one PYTHON=c:/python313/python
+	$(MAKE) compile-win-one PYTHON=c:/python313-32/python
 	$(MAKE) compile-win-one PYTHON=c:/python312/python
 	$(MAKE) compile-win-one PYTHON=c:/python312-32/python
 	$(MAKE) compile-win-one PYTHON=c:/python311/python
@@ -208,6 +210,7 @@ source_nocheck: src/apswversion.h
 	test "`git branch --show-current`" = master
 	find . -depth -name '.*cache' -type d -exec rm -r "{}" \;
 	env APSW_NO_GA=t $(MAKE) doc
+	rm -rf doc/build/html/_static/fonts/ doc/build/html/_static/css/fonts/
 	$(PYTHON) setup.py sdist --formats zip --add-doc
 
 source: source_nocheck # Make the source and then check it builds and tests correctly.  This will catch missing files etc

checksums

@@ -8,6 +8,7 @@
 # more peace of mind because the SQLite releases are not signed in any
 # way.
 
+https://sqlite.org/2024/sqlite-autoconf-3460100.tar.gz 3265571 67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071 923f68143dcd9fc0c38778dee253fd6540a91f578173a04ca5adff885d8a8fbb
 https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz 3265248 6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d 83d2acf79453deb7d6520338b1f4585f12e39b27cd370fb08593afa198f471fc
 
 https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz 3235957 b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531 cc1050780e0266de4d91b31c8deaf4638336908c12c21898e9f1fcae1e2ac303

doc/changes.rst

@@ -10,15 +10,21 @@ history <https://devguide.python.org/versions/>`__.
 APSW changes by version
 -----------------------
 
-next
-====
+3.46.1.0
+========
 
 The shell :ref:`dump <shell-cmd-dump>` command outputs the
 `application_id
 <https://www.sqlite.org/pragma.html#pragma_application_id>`__ in
 addition to the `user_version
 <https://www.sqlite.org/pragma.html#pragma_user_version>`__.
 
+`PyPI <https://pypi.org/project/apsw/>`__ binary builds for `Python
+3.13 now available
+<https://github.com/pypa/cibuildwheel/releases/tag/v2.20.0>`__, as
+well as `older Python ARM64
+<https://github.com/rogerbinns/apsw/pull/530>`__ are available.
+
 3.46.0.1
 ========
 

doc/install.rst

@@ -35,6 +35,12 @@ The PyPI releases include pre-built binaries for common platforms.  If yours is
 pip will download the source release and automatically compile with the same settings.  It will
 require a C compiler and the Python development header files.
 
+Encryption
+^^^^^^^^^^
+
+APSW compiled against SQLite with `SQLite3MultipleCiphers
+<https://utelle.github.io/SQLite3MultipleCiphers/>`__ is available via
+its author at https://pypi.org/project/apsw-sqlite3mc/
 
 Linux/BSD provided
 ------------------
@@ -74,12 +80,12 @@ edit the :file:`setup.apsw` file inside.
 
 .. downloads-begin
 
-* `apsw-3.46.0.1.zip
-  <https://github.com/rogerbinns/apsw/releases/download/3.46.0.1/apsw-3.46.0.1.zip>`__
+* `apsw-3.46.1.0.zip
+  <https://github.com/rogerbinns/apsw/releases/download/3.46.1.0/apsw-3.46.1.0.zip>`__
   (Source, includes this HTML Help)
 
-* `apsw-3.46.0.1.cosign-bundle 
-  <https://github.com/rogerbinns/apsw/releases/download/3.46.0.1/apsw-3.46.0.1.cosign-bundle>`__
+* `apsw-3.46.1.0.cosign-bundle 
+  <https://github.com/rogerbinns/apsw/releases/download/3.46.1.0/apsw-3.46.1.0.cosign-bundle>`__
   cosign signature
 
 .. downloads-end
@@ -114,8 +120,8 @@ Verify
 
   .. code-block:: console
 
-    $ cosign verify-blob apsw-3.46.0.1.zip                           \
-        --bundle apsw-3.46.0.1.cosign-bundle                         \
+    $ cosign verify-blob apsw-3.46.1.0.zip                           \
+        --bundle apsw-3.46.1.0.cosign-bundle                         \
         --certificate-identity=rogerb@rogerbinns.com                 \
         --certificate-oidc-issuer=https://github.com/login/oauth
     Verified OK

src/apswversion.h

@@ -1 +1 @@
-#define APSW_VERSION "3.46.0.1"
+#define APSW_VERSION "3.46.1.0"

tools/checksums.py

@@ -11,6 +11,7 @@
 import setup
 
 sqlitevers = (
+    '3460100',
     '3460000',
     '3450300',
     '3450200',