Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e8c82b6
test release to testpypi to 3.2.4.8 version
Earammak Dec 13, 2024
c9f90e9
test release to testpypi to 3.2.4.8 version
Earammak Dec 13, 2024
ea18a32
test release to testpypi to 3.2.4.8 version
Earammak Dec 13, 2024
2348ef4
Update workflow file
Earammak Dec 13, 2024
ba32399
test release to testpypi to 3.2.4.9 version
Earammak Dec 13, 2024
8ca6b04
test release to testpypi to 3.2.4.9 version
Earammak Dec 13, 2024
70895d7
test release to testpypi to 3.2.4.9 version
Earammak Dec 13, 2024
cc1d54c
test release to testpypi to 3.2.4.9 version
Earammak Dec 13, 2024
e24be59
test release to testpypi to 3.2.4.9 version
Earammak Dec 13, 2024
c4cbedf
test release to testpypi to 3.2.4.9 version
Earammak Dec 16, 2024
d5a4ec3
test release to testpypi to 3.2.4.9 version
Earammak Dec 16, 2024
263682f
test release to testpypi to 3.2.4.9 version
Earammak Dec 16, 2024
8358a4b
test release to testpypi to 3.2.4.9 version
Earammak Dec 16, 2024
3151cc3
test release to testpypi to 3.2.4.9 version
Earammak Dec 16, 2024
7e9cf3e
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
f6ae4a0
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
978f050
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
92412c7
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
3a7c02e
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
7aafe1f
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
70decf4
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
e6cf4c9
test macos library for 3.2.4.9 version
Earammak Dec 16, 2024
7d9c99e
Merge branch 'master' into update_workflow
bimalkjha Dec 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/bld_wheels_and_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
pull_request:
push:
branches:
#- update_workflow
- master
# Sequence of patterns matched against refs/tags
tags:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -120,7 +121,7 @@ jobs:
uses: actions/upload-artifact@v4.4.3
with:
name: ibmdb-wheelsx86-${{ matrix.os }}
path: wheelhouse/*.whl
path: wheelhouse/*.whl

build_sdist:
name: Build source distribution
Expand Down Expand Up @@ -154,7 +155,6 @@ 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 }}
Expand All @@ -166,14 +166,21 @@ jobs:
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:
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.12
35 changes: 35 additions & 0 deletions .github/workflows/test_macos_library.yml
Original file line number Diff line number Diff line change
@@ -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 --ignore-missing-dependencies --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --verbose"
run: |
cibuildwheel --platform macos --output-dir wheelhouse

- name: Verify the wheel
run: |
pip install --no-index --find-links=wheelhouse ibm_db
python -c "import ibm_db"
2 changes: 1 addition & 1 deletion ibm_db.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
+--------------------------------------------------------------------------+
*/

#define MODULE_RELEASE "3.2.4"
#define MODULE_RELEASE "3.2.4.9"

#include <Python.h>
#include <datetime.h>
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -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)

Expand Down