diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 3b7813be..7c0fe1b0 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -23,7 +23,6 @@ jobs: uses: pypa/cibuildwheel@v2.22.0 env: CIBW_BUILD: "*-win_amd64" - CIBW_SKIP: "cp36-* pp*" - uses: actions/upload-artifact@v4.4.3 with: name: ibmdb-wheels64-${{ matrix.os }} @@ -41,7 +40,6 @@ jobs: uses: pypa/cibuildwheel@v2.22.0 env: CIBW_BUILD: "*-win32" - CIBW_SKIP: "cp36-* pp*" - uses: actions/upload-artifact@v4.4.3 with: name: ibmdb-wheels32-${{ matrix.os }} @@ -59,7 +57,7 @@ jobs: uses: pypa/cibuildwheel@v2.22.0 env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_SKIP: "cp36-* *-musllinux_* pp* *-*linux_{aarch64,ppc64le}" + CIBW_SKIP: "*-musllinux_* *-*linux_{aarch64}" CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair --exclude libdb2.so.1 @@ -84,30 +82,24 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4.2.2 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.12' - - - name: Set macOS deployment target - run: echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV + uses: pypa/cibuildwheel@v2.22.0 - name: Install build dependencies run: | pip install --upgrade pip pip install cibuildwheel delocate build + - name: Build the wheel for macOS env: - CIBW_SKIP: "cp36-* cp37-* pp36-* pp37-*" + CIBW_SKIP: "cp37-* cp38-*" CIBW_ARCHS_MACOS: "arm64" - run: | - cibuildwheel --platform macos --output-dir dist + MACOSX_DEPLOYMENT_TARGET: 14.0 + - name: Upload sdist uses: actions/upload-artifact@v4.4.3 with: name: ibmdb-wheelsarm64 - path: dist/*.whl + path: wheelhouse/*.whl build_wheels_macos_x86: name: Build wheels for macOS x86_64 @@ -122,15 +114,12 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install cibuildwheel # Install cibuildwheel to build the wheels - - - name: Set macOS deployment target - run: echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV + pip install cibuildwheel delocate build - - name: Build wheels with cibuildwheel - run: | - CIBW_ARCHS_MACOS="${{ matrix.architecture }}" - python -m cibuildwheel --platform macos --output-dir ./wheelhouse + env: + CIBW_BUILD: "*-x86_64" + CIBW_ARCHS_MACOS: "x86_64" + MACOSX_DEPLOYMENT_TARGET: 10.15 - name: Upload wheels as artifacts uses: actions/upload-artifact@v4.4.3 @@ -172,7 +161,7 @@ jobs: upload_pypi: - needs: [build_sdist,build_wheels_linux, build_wheels_windows_64,build_wheels_windows_32, build_macos_arm64_wheels, build_wheels_macos_x86] + needs: [build_wheels_windows_64, build_wheels_windows_32, build_wheels_linux, build_macos_arm64_wheel, build_wheels_macos_x86, build_sdist] runs-on: ${{ matrix.os }} strategy: matrix: diff --git a/ibm_db.c b/ibm_db.c index 5f06bc69..98572fdb 100644 --- a/ibm_db.c +++ b/ibm_db.c @@ -22,7 +22,7 @@ +--------------------------------------------------------------------------+ */ -#define MODULE_RELEASE "0.0.1" +#define MODULE_RELEASE "0.0.2" #include #include diff --git a/pyproject.toml b/pyproject.toml index 3e154a32..1d64a68b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" -[tool.cibuildwheel.macos] +[tool.cibuildwheel.macos] repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" -skip = "cp36-macosx_x86_64" +skip = "cp36-* pp*" diff --git a/setup.py b/setup.py index bef4fd2c..22907527 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from setuptools.command.install import install PACKAGE = 'ibm_db2' -VERSION = '0.0.1' +VERSION = '0.0.2' LICENSE = 'Apache License 2.0' readme = os.path.join(os.path.dirname(__file__),'README.md')