From 57e0e582311583a2f3450161d117452d1fa0892b Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 10:32:50 +0800 Subject: [PATCH 01/10] Fix building --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 8a2f7ea..1a33ea5 100644 --- a/setup.py +++ b/setup.py @@ -132,6 +132,7 @@ if __name__ == "__main__": # Required for SQLCipher. ("SQLITE_HAS_CODEC", "1"), ("SQLITE_TEMP_STORE", "2"), + ("SQLITE_THREADSAFE", "1") ("SQLITE_EXTRA_INIT", "sqlcipher_extra_init"), ("SQLITE_EXTRA_SHUTDOWN", "sqlcipher_extra_shutdown"), # Increase the maximum number of "host parameters". From 5a931058dd737a8ca826e2d000aa5dd50c41cc24 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 10:37:41 +0800 Subject: [PATCH 02/10] Fix building --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1a33ea5..6c1486e 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,7 @@ if __name__ == "__main__": # Required for SQLCipher. ("SQLITE_HAS_CODEC", "1"), ("SQLITE_TEMP_STORE", "2"), - ("SQLITE_THREADSAFE", "1") + ("SQLITE_THREADSAFE", "1"), ("SQLITE_EXTRA_INIT", "sqlcipher_extra_init"), ("SQLITE_EXTRA_SHUTDOWN", "sqlcipher_extra_shutdown"), # Increase the maximum number of "host parameters". From fe4edf201602dfc4dedb48f34afb2c8e4c419594 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 11:12:08 +0800 Subject: [PATCH 03/10] Fix build --- .github/workflows/pythonpackage.yml | 2 +- setup.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 48c5717..d897fd8 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -198,7 +198,7 @@ jobs: CIBW_BUILD: ${{ matrix.cibw_build }} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_ENVIRONMENT: SQLCIPHER3_COMPILE_TARGET=${{ matrix.compile_target }} - CIBW_BEFORE_ALL_LINUX: yum install -y perl-core + CIBW_BEFORE_ALL_LINUX: dnf -y install perl-core CIBW_TEST_COMMAND: > mv {project}/sqlcipher3 {project}/sqlcipher3_ && python {project}/tests/ && diff --git a/setup.py b/setup.py index 6c1486e..f13b1cb 100644 --- a/setup.py +++ b/setup.py @@ -143,6 +143,9 @@ if __name__ == "__main__": ("inline", "__inline"), ] + if platform.system() == "Linux": + define_macros.append(("HAVE_STDINT_H", "1")) + # Configure the compiler arch = get_arch() if arch == "universal2": From 52d5a5016476a9aa0ce30986e0da0aaafa8472da Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 11:55:47 +0800 Subject: [PATCH 04/10] Fix building --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index d897fd8..9ff1074 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -198,7 +198,7 @@ jobs: CIBW_BUILD: ${{ matrix.cibw_build }} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_ENVIRONMENT: SQLCIPHER3_COMPILE_TARGET=${{ matrix.compile_target }} - CIBW_BEFORE_ALL_LINUX: dnf -y install perl-core + CIBW_BEFORE_ALL_LINUX: yum -y install perl-core CIBW_TEST_COMMAND: > mv {project}/sqlcipher3 {project}/sqlcipher3_ && python {project}/tests/ && From de925eba74f81c6224fc787c216f44b8c4e96bd1 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 12:18:05 +0800 Subject: [PATCH 05/10] Fix building --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index f13b1cb..ac34875 100644 --- a/setup.py +++ b/setup.py @@ -135,6 +135,7 @@ if __name__ == "__main__": ("SQLITE_THREADSAFE", "1"), ("SQLITE_EXTRA_INIT", "sqlcipher_extra_init"), ("SQLITE_EXTRA_SHUTDOWN", "sqlcipher_extra_shutdown"), + ("HAVE_STDINT_H", "1"), # Increase the maximum number of "host parameters". ("SQLITE_MAX_VARIABLE_NUMBER", "250000"), # Additional nice-to-have. @@ -143,9 +144,6 @@ if __name__ == "__main__": ("inline", "__inline"), ] - if platform.system() == "Linux": - define_macros.append(("HAVE_STDINT_H", "1")) - # Configure the compiler arch = get_arch() if arch == "universal2": From fc88397ef2006349a9235729bac546dbdacc1ff1 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 14:09:51 +0800 Subject: [PATCH 06/10] Fix building --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 9ff1074..7963385 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -198,7 +198,7 @@ jobs: CIBW_BUILD: ${{ matrix.cibw_build }} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_ENVIRONMENT: SQLCIPHER3_COMPILE_TARGET=${{ matrix.compile_target }} - CIBW_BEFORE_ALL_LINUX: yum -y install perl-core + CIBW_BEFORE_ALL_LINUX: command -v yum >/dev/null && yum -y install perl-core || command -v apk >/dev/null && apk add perl CIBW_TEST_COMMAND: > mv {project}/sqlcipher3 {project}/sqlcipher3_ && python {project}/tests/ && From 5cbab0b2cdfc1792e3d17c5466b5c7da6b97cffc Mon Sep 17 00:00:00 2001 From: laggykiller Date: Tue, 26 Aug 2025 14:48:21 +0800 Subject: [PATCH 07/10] fix building --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 7963385..c57f844 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -198,7 +198,7 @@ jobs: CIBW_BUILD: ${{ matrix.cibw_build }} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_ENVIRONMENT: SQLCIPHER3_COMPILE_TARGET=${{ matrix.compile_target }} - CIBW_BEFORE_ALL_LINUX: command -v yum >/dev/null && yum -y install perl-core || command -v apk >/dev/null && apk add perl + CIBW_BEFORE_ALL_LINUX: command -v yum >/dev/null && yum -y install perl-core || command -v apk >/dev/null && apk add perl || true CIBW_TEST_COMMAND: > mv {project}/sqlcipher3 {project}/sqlcipher3_ && python {project}/tests/ && From 1430d530a87651df74c269b28c5ec60a248dbc72 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Mon, 24 Nov 2025 15:26:27 +0800 Subject: [PATCH 08/10] Build on python 3.14; Drop python <3.8 --- .github/workflows/pythonpackage.yml | 39 ++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index c57f844..0e3b067 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -69,101 +69,121 @@ jobs: - os: ubuntu-latest cibw_archs: x86_64 cibw_build: "cp*-manylinux_*" + cibw_skip: "" compile_target: x86_64 out: x86_64-manylinux - os: ubuntu-latest cibw_archs: x86_64 cibw_build: "cp*-musllinux_*" + cibw_skip: "" compile_target: x86_64 out: x86_64-musllinux - os: ubuntu-24.04-arm cibw_archs: aarch64 cibw_build: "cp*-manylinux_*" + cibw_skip: "" compile_target: armv8 out: armv8-manylinux - os: ubuntu-24.04-arm cibw_archs: aarch64 cibw_build: "cp*-musllinux_*" + cibw_skip: "" compile_target: armv8 out: armv8-musllinux - os: ubuntu-latest cibw_archs: i686 cibw_build: "cp*-manylinux_*" + cibw_skip: "" compile_target: x86 out: x86-manylinux - os: ubuntu-latest cibw_archs: i686 cibw_build: "cp*-musllinux_*" + cibw_skip: "" compile_target: x86 out: x86-musllinux - os: ubuntu-latest cibw_archs: ppc64le - cibw_build: "cp36-manylinux_* cp37-manylinux_* cp38-manylinux_* cp39-manylinux_*" + cibw_build: "cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_*" + cibw_skip: "" compile_target: ppc64le out: pp64le-manylinux-1 - os: ubuntu-latest cibw_archs: ppc64le - cibw_build: "cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*" + cibw_build: "cp*-manylinux_*" + cibw_skip: "cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_*" compile_target: ppc64le out: pp64le-manylinux-2 - os: ubuntu-latest cibw_archs: ppc64le - cibw_build: "cp36-musllinux_* cp37-musllinux_* cp38-musllinux_* cp39-musllinux_*" + cibw_build: "cp38-musllinux_* cp39-musllinux_* cp310-musllinux_* cp311-musllinux_*" + cibw_skip: "" compile_target: ppc64le out: ppc64le-musllinux-1 - os: ubuntu-latest cibw_archs: ppc64le - cibw_build: "cp310-musllinux_* cp311-musllinux_* cp312-musllinux_* cp313-musllinux_*" + cibw_build: "cp*-musllinux_*" + cibw_skip: "cp38-musllinux_* cp39-musllinux_* cp310-musllinux_* cp311-musllinux_*" compile_target: ppc64le out: ppc64le-musllinux-2 - os: ubuntu-latest cibw_archs: s390x - cibw_build: "cp36-manylinux_* cp37-manylinux_* cp38-manylinux_* cp39-manylinux_*" + cibw_build: "cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_*" + cibw_skip: "" compile_target: s390x out: s390x-manylinux-1 - os: ubuntu-latest cibw_archs: s390x - cibw_build: "cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*" + cibw_build: "cp*-manylinux_*" + cibw_skip: "cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_*" compile_target: s390x out: s390x-manylinux-2 - os: ubuntu-latest cibw_archs: s390x - cibw_build: "cp36-musllinux_* cp37-musllinux_* cp38-musllinux_* cp39-musllinux_*" + cibw_build: "cp38-musllinux_* cp39-musllinux_* cp310-musllinux_* cp311-musllinux_*" + cibw_skip: "" compile_target: s390x out: s390x-musllinux-1 - os: ubuntu-latest cibw_archs: s390x - cibw_build: "cp310-musllinux_* cp311-musllinux_* cp312-musllinux_* cp313-musllinux_*" + cibw_build: "cp*-musllinux_*" + cibw_skip: "cp38-musllinux_* cp39-musllinux_* cp310-musllinux_* cp311-musllinux_*" compile_target: s390x out: s390x-musllinux-2 - os: windows-latest cibw_archs: AMD64 cibw_build: "cp*" + cibw_skip: "" compile_target: x86_64 out: x86_64-windows - os: windows-latest cibw_archs: x86 cibw_build: "cp*" + cibw_skip: "" compile_target: x86 out: x86-windows - os: windows-latest cibw_archs: ARM64 cibw_build: "cp*" + cibw_skip: "" compile_target: armv8 out: armv8-windows - os: macos-13 cibw_archs: x86_64 cibw_build: "cp*" + cibw_skip: "" compile_target: x86_64 out: x86_64-macos - os: macos-latest cibw_archs: arm64 cibw_build: "cp*" + cibw_skip: "" compile_target: armv8 out: armv8-macos - os: macos-latest cibw_archs: universal2 cibw_build: "cp*" + cibw_skip: "" compile_target: universal2 out: universal2-macos @@ -192,10 +212,11 @@ jobs: path: ./src/sqlcipher - name: Build wheels for ${{ matrix.os }} ${{ matrix.cibw_archs }} ${{ matrix.cibw_build }} - uses: pypa/cibuildwheel@v2.23.3 + uses: pypa/cibuildwheel@v3.3.0 env: CIBW_BUILD_FRONTEND: build CIBW_BUILD: ${{ matrix.cibw_build }} + CIBW_SKIP: ${{ matrix.cibw_skip }} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_ENVIRONMENT: SQLCIPHER3_COMPILE_TARGET=${{ matrix.compile_target }} CIBW_BEFORE_ALL_LINUX: command -v yum >/dev/null && yum -y install perl-core || command -v apk >/dev/null && apk add perl || true From fb134e0b80f5e63f5ff6c2a19f3a944886eb9412 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Mon, 24 Nov 2025 15:26:49 +0800 Subject: [PATCH 09/10] 0.5.6 --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2388ab1..ebcce19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "sqlcipher3-wheels" -version = "0.5.5.post0" +version = "0.5.6" description = "DB-API 2.0 interface for SQLCipher 3.x" readme = { content-type = "text/markdown", file = "README.md" } authors = [ diff --git a/setup.py b/setup.py index ac34875..1dd88cf 100644 --- a/setup.py +++ b/setup.py @@ -218,7 +218,7 @@ if __name__ == "__main__": # With pyproject.toml, all are not necessary except ext_modules # However, they are kept for building python 3.6 wheels name="sqlcipher3-wheels", - version="0.5.5.post0", + version="0.5.6", package_dir={"sqlcipher3": "sqlcipher3"}, packages=["sqlcipher3"], ext_modules=[module], From 2f68084bdd558cae62a54fbeb03d715ec6c432d8 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 21 Dec 2025 11:57:07 +1100 Subject: [PATCH 10/10] Upgrade to SQLCipher v4.12.0 --- sqlcipher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlcipher b/sqlcipher index d41a25f..ab223bd 160000 --- a/sqlcipher +++ b/sqlcipher @@ -1 +1 @@ -Subproject commit d41a25f448ba08ce24c0a599cf322046bdaa135a +Subproject commit ab223bd801ec225d1497a077da08777d21d1266d