From e8c82b628b9c2b2e83ea45e8595f17811c6b0d01 Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 15:11:03 +0530 Subject: [PATCH 01/22] test release to testpypi to 3.2.4.8 version --- .github/workflows/bld_wheels_and_upload.yml | 46 ++++++++++++--------- ibm_db.c | 2 +- setup.py | 2 +- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index d51a0159..4f4521f7 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -1,12 +1,11 @@ name: Build and upload to PyPI - # Build on every workflow_dispatch, branch push, tag push, and pull request change on: workflow_dispatch: pull_request: push: branches: - - master + - update_workflow # Sequence of patterns matched against refs/tags tags: - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 @@ -27,9 +26,9 @@ jobs: CIBW_SKIP: "cp36-* pp*" - uses: actions/upload-artifact@v4.4.3 with: - name: wheels_windows64__${{ github.sha }} - path: ./wheelhouse/*.whl - + name: ibmdb-wheels64-${{ matrix.os }} + path: wheelhouse/*.whl + build_wheels_windows_32: name: Build wheels on ${{ matrix.os }} 32-bit runs-on: ${{ matrix.os }} @@ -45,9 +44,9 @@ jobs: CIBW_SKIP: "cp36-* pp*" - uses: actions/upload-artifact@v4.4.3 with: - name: wheels_windows32__${{ github.sha }} - path: ./wheelhouse/*.whl - + name: ibmdb-wheels32-${{ matrix.os }} + path: wheelhouse/*.whl + build_wheels_linux: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -76,8 +75,8 @@ jobs: {wheel} - uses: actions/upload-artifact@v4.4.3 with: - name: wheels_linux__${{ github.sha }} - path: ./wheelhouse/*.whl + name: ibmdb-wheels-${{ matrix.os }} + path: wheelhouse/*.whl build_macos_arm64_wheels: name: Build wheels on macOS ARM64 @@ -91,8 +90,8 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4.4.3 with: - name: wheels_macos_arm64__${{ github.sha }} - path: ./wheelhouse/*.whl + name: ibmdb-wheelsarm64-${{ matrix.os }} + path: wheelhouse/*.whl build_wheels_macos_x86: name: Build wheels for macOS x86_64 @@ -120,8 +119,8 @@ jobs: - name: Upload wheels as artifacts uses: actions/upload-artifact@v4.4.3 with: - name: wheels_macosx86_python313__${{ github.sha }} - path: ./wheelhouse/*.whl + name: ibmdb-wheelsx86-${{ matrix.os }} + path: wheelhouse/*.whl build_sdist: name: Build source distribution @@ -152,8 +151,8 @@ jobs: - name: Upload sdist uses: actions/upload-artifact@v4.4.3 with: - path: | - ./dist/*.tar.gz + name: ibmdb-sdist + path: dist/*.tar.gz upload_pypi: @@ -170,10 +169,17 @@ jobs: steps: - uses: actions/download-artifact@v4.1.7 with: - # unpacks default artifact into dist/ - #if `name: artifact` is omitted, the action will create extra parent dir - name: artifact path: dist + pattern: ibmdb-* + merge-multiple: true + + - name: Publish to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1.12 + with: + token: ${{secrets.TEST_PYPI_TOKEN}} + repository_url: https://test.pypi.org/legacy/ + password: ${{ secrets.testpypi_token }} + - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@release/v1 + uses: pypa/gh-action-pypi-publish@release/v1.12 \ No newline at end of file diff --git a/ibm_db.c b/ibm_db.c index d90150ca..a2eaa1e9 100644 --- a/ibm_db.c +++ b/ibm_db.c @@ -22,7 +22,7 @@ +--------------------------------------------------------------------------+ */ -#define MODULE_RELEASE "3.2.4" +#define MODULE_RELEASE "3.2.4.8" #include #include diff --git a/setup.py b/setup.py index 603f220c..49c51c85 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from setuptools.command.install import install PACKAGE = 'ibm_db' -VERSION = '3.2.4' +VERSION = '3.2.4.8' LICENSE = 'Apache License 2.0' readme = os.path.join(os.path.dirname(__file__),'README.md') From c9f90e95233775dee83913e8b325e438d5bba99a Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 15:19:37 +0530 Subject: [PATCH 02/22] test release to testpypi to 3.2.4.8 version --- .github/workflows/bld_wheels_and_upload.yml | 2 +- ibm_db.c | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 4f4521f7..1b7d9e11 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -165,7 +165,7 @@ jobs: # IMPORTANT: this permission is mandatory for trusted publishing id-token: write #upload to PyPI on every tag starting with 'v' - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') steps: - uses: actions/download-artifact@v4.1.7 with: diff --git a/ibm_db.c b/ibm_db.c index a2eaa1e9..d90150ca 100644 --- a/ibm_db.c +++ b/ibm_db.c @@ -22,7 +22,7 @@ +--------------------------------------------------------------------------+ */ -#define MODULE_RELEASE "3.2.4.8" +#define MODULE_RELEASE "3.2.4" #include #include diff --git a/setup.py b/setup.py index 49c51c85..603f220c 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from setuptools.command.install import install PACKAGE = 'ibm_db' -VERSION = '3.2.4.8' +VERSION = '3.2.4' LICENSE = 'Apache License 2.0' readme = os.path.join(os.path.dirname(__file__),'README.md') From ea18a32e01469e2c679f55e5f73ac070fbd563a3 Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 15:43:28 +0530 Subject: [PATCH 03/22] test release to testpypi to 3.2.4.8 version --- ibm_db.c | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_db.c b/ibm_db.c index d90150ca..a2eaa1e9 100644 --- a/ibm_db.c +++ b/ibm_db.c @@ -22,7 +22,7 @@ +--------------------------------------------------------------------------+ */ -#define MODULE_RELEASE "3.2.4" +#define MODULE_RELEASE "3.2.4.8" #include #include diff --git a/setup.py b/setup.py index 603f220c..49c51c85 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from setuptools.command.install import install PACKAGE = 'ibm_db' -VERSION = '3.2.4' +VERSION = '3.2.4.8' LICENSE = 'Apache License 2.0' readme = os.path.join(os.path.dirname(__file__),'README.md') From 2348ef4f2270c39abf5304960eec17a38d6ca5e4 Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 16:02:04 +0530 Subject: [PATCH 04/22] Update workflow file --- .github/workflows/bld_wheels_and_upload.yml | 4 ++-- ibm_db.c | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 1b7d9e11..5703c04d 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - update_workflow + - master # Sequence of patterns matched against refs/tags tags: - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 @@ -165,7 +165,7 @@ jobs: # IMPORTANT: this permission is mandatory for trusted publishing id-token: write #upload to PyPI on every tag starting with 'v' - #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') steps: - uses: actions/download-artifact@v4.1.7 with: diff --git a/ibm_db.c b/ibm_db.c index a2eaa1e9..d90150ca 100644 --- a/ibm_db.c +++ b/ibm_db.c @@ -22,7 +22,7 @@ +--------------------------------------------------------------------------+ */ -#define MODULE_RELEASE "3.2.4.8" +#define MODULE_RELEASE "3.2.4" #include #include diff --git a/setup.py b/setup.py index 49c51c85..603f220c 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from setuptools.command.install import install PACKAGE = 'ibm_db' -VERSION = '3.2.4.8' +VERSION = '3.2.4' LICENSE = 'Apache License 2.0' readme = os.path.join(os.path.dirname(__file__),'README.md') From ba32399d70c0e18bf4e7856b4f6513bf342ea02c Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 21:56:58 +0530 Subject: [PATCH 05/22] test release to testpypi to 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 40 +++++++++++---------- ibm_db.c | 2 +- setup.py | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 5703c04d..55c99f27 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -1,14 +1,12 @@ name: Build and upload to PyPI -# Build on every workflow_dispatch, branch push, tag push, and pull request change on: workflow_dispatch: pull_request: push: branches: - - master - # Sequence of patterns matched against refs/tags + - update_workflow tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + - 'v*' jobs: build_wheels_windows_64: @@ -87,6 +85,12 @@ jobs: uses: pypa/cibuildwheel@v2.22.0 env: CIBW_SKIP: "cp36-*" + - name: Repair macOS wheels with delocate + run: | + pip install cibuildwheel delocate + for wheel in wheelhouse/*.whl; do + delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v "$wheel" + done - name: Upload wheels uses: actions/upload-artifact@v4.4.3 with: @@ -96,17 +100,15 @@ jobs: build_wheels_macos_x86: name: Build wheels for macOS x86_64 runs-on: macos-13 - strategy: matrix: architecture: [x86_64] - steps: - uses: actions/checkout@v4.2.2 - name: Install dependencies run: | python -m pip install --upgrade pip - pip install cibuildwheel # Install cibuildwheel to build the wheels + pip install cibuildwheel delocate # Install cibuildwheel and delocate for repairing macOS wheels - name: Set macOS deployment target run: echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV @@ -116,11 +118,17 @@ jobs: CIBW_ARCHS_MACOS="${{ matrix.architecture }}" python -m cibuildwheel --platform macos --output-dir ./wheelhouse + - name: Repair macOS wheels with delocate + run: | + for wheel in wheelhouse/*.whl; do + delocate-wheel --ignore-missing-dependencies --require-archs x86 -w ./repaired_wheel -v "$wheel" + done + - name: Upload wheels as artifacts uses: actions/upload-artifact@v4.4.3 with: name: ibmdb-wheelsx86-${{ matrix.os }} - path: wheelhouse/*.whl + path: repaired_wheel/*.whl build_sdist: name: Build source distribution @@ -154,18 +162,11 @@ jobs: name: ibmdb-sdist path: dist/*.tar.gz - upload_pypi: - needs: [build_sdist,build_wheels_linux, build_wheels_windows_64,build_wheels_windows_32, build_macos_arm64_wheels, build_wheels_macos_x86] - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] + needs: [build_sdist, build_wheels_linux, build_wheels_windows_64, build_wheels_windows_32, build_macos_arm64_wheels, build_wheels_macos_x86] + runs-on: ubuntu-latest permissions: - # IMPORTANT: this permission is mandatory for trusted publishing id-token: write - #upload to PyPI on every tag starting with 'v' - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') steps: - uses: actions/download-artifact@v4.1.7 with: @@ -182,4 +183,7 @@ jobs: - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@release/v1.12 \ No newline at end of file + uses: pypa/gh-action-pypi-publish@release/v1.12 + with: + token: ${{secrets.PYPI_TOKEN}} + repository_url: https://pypi.org/legacy/ diff --git a/ibm_db.c b/ibm_db.c index d90150ca..7fedf848 100644 --- a/ibm_db.c +++ b/ibm_db.c @@ -22,7 +22,7 @@ +--------------------------------------------------------------------------+ */ -#define MODULE_RELEASE "3.2.4" +#define MODULE_RELEASE "3.2.4.9" #include #include diff --git a/setup.py b/setup.py index 603f220c..1747d8d8 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ from setuptools.command.install import install PACKAGE = 'ibm_db' -VERSION = '3.2.4' +VERSION = '3.2.4.9' LICENSE = 'Apache License 2.0' readme = os.path.join(os.path.dirname(__file__),'README.md') From 8ca6b04c46f51f10800e52ec91a8a638d89abd0f Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 22:04:51 +0530 Subject: [PATCH 06/22] test release to testpypi to 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 55c99f27..8879e303 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -87,7 +87,7 @@ jobs: CIBW_SKIP: "cp36-*" - name: Repair macOS wheels with delocate run: | - pip install cibuildwheel delocate + #pip install cibuildwheel delocate for wheel in wheelhouse/*.whl; do delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v "$wheel" done From 70895d76ec9ccc514a766a729f5430c1c199aca2 Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 22:11:20 +0530 Subject: [PATCH 07/22] test release to testpypi to 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 8879e303..a159a2ae 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -121,7 +121,7 @@ jobs: - name: Repair macOS wheels with delocate run: | for wheel in wheelhouse/*.whl; do - delocate-wheel --ignore-missing-dependencies --require-archs x86 -w ./repaired_wheel -v "$wheel" + delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v "$wheel" done - name: Upload wheels as artifacts From cc1d54cf1610e059089e3ede70fa9d23f9a77e93 Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 22:14:09 +0530 Subject: [PATCH 08/22] test release to testpypi to 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index a159a2ae..beaabdfa 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -117,6 +117,7 @@ jobs: run: | CIBW_ARCHS_MACOS="${{ matrix.architecture }}" python -m cibuildwheel --platform macos --output-dir ./wheelhouse + delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v *.whl - name: Repair macOS wheels with delocate run: | From e24be5990a6b9064b0a2924924e6a80c36c2878a Mon Sep 17 00:00:00 2001 From: ek Date: Fri, 13 Dec 2024 22:20:10 +0530 Subject: [PATCH 09/22] test release to testpypi to 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index beaabdfa..b07a0976 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -87,7 +87,7 @@ jobs: CIBW_SKIP: "cp36-*" - name: Repair macOS wheels with delocate run: | - #pip install cibuildwheel delocate + pip install cibuildwheel delocate for wheel in wheelhouse/*.whl; do delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v "$wheel" done From c4cbedf0cb8231ed1cf4cba58d059ba5086d3611 Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 09:52:22 +0530 Subject: [PATCH 10/22] test release to testpypi to 3.2.4.9 version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3e154a32..a5e1e681 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,5 +2,5 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.cibuildwheel.macos] -repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" +#repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" skip = "cp36-macosx_x86_64" From d5a4ec3d35378a5aff6e0545862d147d08aa3938 Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 09:56:38 +0530 Subject: [PATCH 11/22] test release to testpypi to 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 39 +++++++++------------ 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index b07a0976..1b7d9e11 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -1,12 +1,14 @@ name: Build and upload to PyPI +# Build on every workflow_dispatch, branch push, tag push, and pull request change on: workflow_dispatch: pull_request: push: branches: - update_workflow + # Sequence of patterns matched against refs/tags tags: - - 'v*' + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 jobs: build_wheels_windows_64: @@ -85,12 +87,6 @@ jobs: uses: pypa/cibuildwheel@v2.22.0 env: CIBW_SKIP: "cp36-*" - - name: Repair macOS wheels with delocate - run: | - pip install cibuildwheel delocate - for wheel in wheelhouse/*.whl; do - delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v "$wheel" - done - name: Upload wheels uses: actions/upload-artifact@v4.4.3 with: @@ -100,15 +96,17 @@ jobs: build_wheels_macos_x86: name: Build wheels for macOS x86_64 runs-on: macos-13 + strategy: matrix: architecture: [x86_64] + steps: - uses: actions/checkout@v4.2.2 - name: Install dependencies run: | python -m pip install --upgrade pip - pip install cibuildwheel delocate # Install cibuildwheel and delocate for repairing macOS wheels + pip install cibuildwheel # Install cibuildwheel to build the wheels - name: Set macOS deployment target run: echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV @@ -117,19 +115,12 @@ jobs: run: | CIBW_ARCHS_MACOS="${{ matrix.architecture }}" python -m cibuildwheel --platform macos --output-dir ./wheelhouse - delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v *.whl - - - name: Repair macOS wheels with delocate - run: | - for wheel in wheelhouse/*.whl; do - delocate-wheel --ignore-missing-dependencies --require-archs arm64 -w ./repaired_wheel -v "$wheel" - done - name: Upload wheels as artifacts uses: actions/upload-artifact@v4.4.3 with: name: ibmdb-wheelsx86-${{ matrix.os }} - path: repaired_wheel/*.whl + path: wheelhouse/*.whl build_sdist: name: Build source distribution @@ -163,11 +154,18 @@ jobs: name: ibmdb-sdist path: dist/*.tar.gz + upload_pypi: - needs: [build_sdist, build_wheels_linux, build_wheels_windows_64, build_wheels_windows_32, build_macos_arm64_wheels, build_wheels_macos_x86] - runs-on: ubuntu-latest + needs: [build_sdist,build_wheels_linux, build_wheels_windows_64,build_wheels_windows_32, build_macos_arm64_wheels, build_wheels_macos_x86] + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] permissions: + # IMPORTANT: this permission is mandatory for trusted publishing id-token: write + #upload to PyPI on every tag starting with 'v' + #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') steps: - uses: actions/download-artifact@v4.1.7 with: @@ -184,7 +182,4 @@ jobs: - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@release/v1.12 - with: - token: ${{secrets.PYPI_TOKEN}} - repository_url: https://pypi.org/legacy/ + uses: pypa/gh-action-pypi-publish@release/v1.12 \ No newline at end of file From 263682f40d4b54e8a9489d27db00ff82677faabc Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 10:03:04 +0530 Subject: [PATCH 12/22] test release to testpypi to 3.2.4.9 version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a5e1e681..3e154a32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,5 +2,5 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.cibuildwheel.macos] -#repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" +repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" skip = "cp36-macosx_x86_64" From 8358a4b75110f405999bad3f0a028f8e79b8190f Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 10:06:00 +0530 Subject: [PATCH 13/22] test release to testpypi to 3.2.4.9 version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3e154a32..9cdebba0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,5 +2,5 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.cibuildwheel.macos] -repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" +repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" skip = "cp36-macosx_x86_64" From 3151cc334847960978d519bfbc3495f36c009601 Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 10:44:56 +0530 Subject: [PATCH 14/22] test release to testpypi to 3.2.4.9 version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9cdebba0..3e154a32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,5 +2,5 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.cibuildwheel.macos] -repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" +repair-wheel-command = "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" skip = "cp36-macosx_x86_64" From 7e9cf3ee2507602166b9b475eb4e3b8ad7dc3967 Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:22:57 +0530 Subject: [PATCH 15/22] test macos library for 3.2.4.9 version --- .github/workflows/bld_wheels_and_upload.yml | 5 +-- .github/workflows/test_macos_library.yml | 35 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/test_macos_library.yml diff --git a/.github/workflows/bld_wheels_and_upload.yml b/.github/workflows/bld_wheels_and_upload.yml index 1b7d9e11..7706c573 100644 --- a/.github/workflows/bld_wheels_and_upload.yml +++ b/.github/workflows/bld_wheels_and_upload.yml @@ -5,7 +5,8 @@ on: pull_request: push: branches: - - update_workflow + #- update_workflow + - master # Sequence of patterns matched against refs/tags tags: - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 @@ -84,7 +85,7 @@ jobs: steps: - uses: actions/checkout@v4.2.2 - name: Build wheels - uses: pypa/cibuildwheel@v2.22.0 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_SKIP: "cp36-*" - name: Upload wheels diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml new file mode 100644 index 00000000..c8fe48fc --- /dev/null +++ b/.github/workflows/test_macos_library.yml @@ -0,0 +1,35 @@ +name: Build and Repair Wheel + +on: + push: + branches: + - update_workflow + +jobs: + build: + runs-on: macos-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.12' + + - name: Install build dependencies + run: | + pip install --upgrade pip + pip install cibuildwheel delocate + + - name: Build the wheel for macOS + env: + CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --verbose" + run: | + cibuildwheel --platform macos --output-dir wheelhouse + + - name: Verify the wheel + run: | + pip install --no-index --find-links=wheelhouse ibm_db-3.2.4.9-cp312-cp312-macosx_11_0_arm64.whl + python -c "import ibm_db" From f6ae4a0fe3437070a41249af2c28ec0f70e58ecd Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:31:00 +0530 Subject: [PATCH 16/22] test macos library for 3.2.4.9 version --- .github/workflows/test_macos_library.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml index c8fe48fc..45a3241e 100644 --- a/.github/workflows/test_macos_library.yml +++ b/.github/workflows/test_macos_library.yml @@ -25,7 +25,7 @@ jobs: - name: Build the wheel for macOS env: - CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --verbose" + CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --verbose" run: | cibuildwheel --platform macos --output-dir wheelhouse From 978f0509350d03cd130e0fca8a508cbd18d1f277 Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:39:46 +0530 Subject: [PATCH 17/22] test macos library for 3.2.4.9 version --- .github/workflows/test_macos_library.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml index 45a3241e..9afb950c 100644 --- a/.github/workflows/test_macos_library.yml +++ b/.github/workflows/test_macos_library.yml @@ -31,5 +31,5 @@ jobs: - name: Verify the wheel run: | - pip install --no-index --find-links=wheelhouse ibm_db-3.2.4.9-cp312-cp312-macosx_11_0_arm64.whl + pip install --no-index --find-links=wheelhouse ibm_db python -c "import ibm_db" From 92412c7fba35ea8051cba9b9fc643cee610d9d0a Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:51:38 +0530 Subject: [PATCH 18/22] test macos library for 3.2.4.9 version --- .github/workflows/test_macos_library.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml index 9afb950c..96596d2d 100644 --- a/.github/workflows/test_macos_library.yml +++ b/.github/workflows/test_macos_library.yml @@ -29,6 +29,11 @@ jobs: run: | cibuildwheel --platform macos --output-dir wheelhouse + - name: Repair the wheel by including libdb2.dylib + run: | + # If libdb2.dylib is installed or manually copied, you can use delocate to bundle it + delocate-wheel --verbose --install-path /usr/local/lib wheelhouse/*.whl + - name: Verify the wheel run: | pip install --no-index --find-links=wheelhouse ibm_db From 3a7c02e6ed1acdc3ac979954eac633aad9038acd Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:53:19 +0530 Subject: [PATCH 19/22] test macos library for 3.2.4.9 version --- .github/workflows/test_macos_library.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml index 96596d2d..1bbd6269 100644 --- a/.github/workflows/test_macos_library.yml +++ b/.github/workflows/test_macos_library.yml @@ -25,6 +25,7 @@ jobs: - name: Build the wheel for macOS env: + CIBW_BUILD: cp312-* CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --verbose" run: | cibuildwheel --platform macos --output-dir wheelhouse From 7aafe1f193a11ff0c1c3dacd30f9d08a8cab012c Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:56:25 +0530 Subject: [PATCH 20/22] test macos library for 3.2.4.9 version --- .github/workflows/test_macos_library.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml index 1bbd6269..51695d7c 100644 --- a/.github/workflows/test_macos_library.yml +++ b/.github/workflows/test_macos_library.yml @@ -25,7 +25,7 @@ jobs: - name: Build the wheel for macOS env: - CIBW_BUILD: cp312-* + CIBW_BUILD: "cp312-*" CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --verbose" run: | cibuildwheel --platform macos --output-dir wheelhouse From 70decf43b155fbf59e835ea7b50c8177f6d987a5 Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 11:58:22 +0530 Subject: [PATCH 21/22] test macos library for 3.2.4.9 version --- .github/workflows/test_macos_library.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test_macos_library.yml b/.github/workflows/test_macos_library.yml index 51695d7c..9afb950c 100644 --- a/.github/workflows/test_macos_library.yml +++ b/.github/workflows/test_macos_library.yml @@ -25,16 +25,10 @@ jobs: - name: Build the wheel for macOS env: - CIBW_BUILD: "cp312-*" CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --verbose" run: | cibuildwheel --platform macos --output-dir wheelhouse - - name: Repair the wheel by including libdb2.dylib - run: | - # If libdb2.dylib is installed or manually copied, you can use delocate to bundle it - delocate-wheel --verbose --install-path /usr/local/lib wheelhouse/*.whl - - name: Verify the wheel run: | pip install --no-index --find-links=wheelhouse ibm_db From e6cf4c99449474b3521e95aaf354e945c4c0d28f Mon Sep 17 00:00:00 2001 From: ek Date: Mon, 16 Dec 2024 12:46:41 +0530 Subject: [PATCH 22/22] test macos library for 3.2.4.9 version --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 1747d8d8..7f8402d3 100644 --- a/setup.py +++ b/setup.py @@ -161,16 +161,16 @@ def run(self): # no IBM_DB_HOME during install, keep current value return - for so in glob.glob(get_python_lib()+r'/ibm_db*.so'): - os.system("install_name_tool -change @loader_path/clidriver/lib/libdb2.dylib {}/lib/libdb2.dylib {}".format(clipath, so)) + #for so in glob.glob(get_python_lib()+r'/ibm_db*.so'): + # os.system("install_name_tool -change @loader_path/clidriver/lib/libdb2.dylib {}/lib/libdb2.dylib {}".format(clipath, so)) class PostBuildExt(build_ext): """ Post build_ext - update db2 dynamic lib to use loader_path on Darwin """ def run(self): build_ext.run(self) clipath = os.getenv('IBM_DB_HOME', '@loader_path/clidriver') - for so in glob.glob(self.build_lib+r'/ibm_db*.so'): - os.system("install_name_tool -change libdb2.dylib {}/lib/libdb2.dylib {}".format(clipath, so)) + #for so in glob.glob(self.build_lib+r'/ibm_db*.so'): + # os.system("install_name_tool -change libdb2.dylib {}/lib/libdb2.dylib {}".format(clipath, so)) cmd_class = dict(install = PostInstall, build_ext = PostBuildExt)