diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 48c5717..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,13 +212,14 @@ 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: yum install -y perl-core + 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/ && 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 8a2f7ea..1dd88cf 100644 --- a/setup.py +++ b/setup.py @@ -132,8 +132,10 @@ 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"), + ("HAVE_STDINT_H", "1"), # Increase the maximum number of "host parameters". ("SQLITE_MAX_VARIABLE_NUMBER", "250000"), # Additional nice-to-have. @@ -216,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], diff --git a/sqlcipher b/sqlcipher index d41a25f..ab223bd 160000 --- a/sqlcipher +++ b/sqlcipher @@ -1 +1 @@ -Subproject commit d41a25f448ba08ce24c0a599cf322046bdaa135a +Subproject commit ab223bd801ec225d1497a077da08777d21d1266d