diff --git a/.github/workflows/build-pypi.yml b/.github/workflows/build-pypi.yml index a042d615..3343deb2 100644 --- a/.github/workflows/build-pypi.yml +++ b/.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 }} diff --git a/.github/workflows/build-testpypi.yml b/.github/workflows/build-testpypi.yml index 17ab1783..a9d60dcc 100644 --- a/.github/workflows/build-testpypi.yml +++ b/.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 }} diff --git a/Makefile b/Makefile index b4a39d20..10e6b972 100644 --- a/Makefile +++ b/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 diff --git a/checksums b/checksums index 95f7306c..2494e19c 100644 --- a/checksums +++ b/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 diff --git a/doc/changes.rst b/doc/changes.rst index 77654ed1..a69b608f 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -10,8 +10,8 @@ history `__. APSW changes by version ----------------------- -next -==== +3.46.1.0 +======== The shell :ref:`dump ` command outputs the `application_id @@ -19,6 +19,12 @@ The shell :ref:`dump ` command outputs the addition to the `user_version `__. +`PyPI `__ binary builds for `Python +3.13 now available +`__, as +well as `older Python ARM64 +`__ are available. + 3.46.0.1 ======== diff --git a/doc/install.rst b/doc/install.rst index ae1ef296..c08ee617 100644 --- a/doc/install.rst +++ b/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 +`__ 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 - `__ +* `apsw-3.46.1.0.zip + `__ (Source, includes this HTML Help) -* `apsw-3.46.0.1.cosign-bundle - `__ +* `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 diff --git a/src/apswversion.h b/src/apswversion.h index ffe36eab..42f9097c 100644 --- a/src/apswversion.h +++ b/src/apswversion.h @@ -1 +1 @@ -#define APSW_VERSION "3.46.0.1" +#define APSW_VERSION "3.46.1.0" diff --git a/tools/checksums.py b/tools/checksums.py index d25a3d4f..7aba9c26 100755 --- a/tools/checksums.py +++ b/tools/checksums.py @@ -11,6 +11,7 @@ import setup sqlitevers = ( + '3460100', '3460000', '3450300', '3450200',