Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 22 additions & 19 deletions .github/workflows/bld_wheels_and_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
os: [windows-latest]

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v2.22.0
uses: pypa/cibuildwheel@v3.1.4
env:
CIBW_BUILD: "*-win_amd64"
CIBW_SKIP: "cp36-* pp*"
CIBW_SKIP: "cp38-*"

- uses: actions/upload-artifact@v4.4.3
with:
Expand All @@ -39,12 +39,12 @@ jobs:
os: [windows-latest]

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v2.22.0
uses: pypa/cibuildwheel@v3.1.4
env:
CIBW_BUILD: "*-win32"
CIBW_SKIP: "cp36-* pp*"
CIBW_SKIP: "cp38-*"

- uses: actions/upload-artifact@v4.4.3
with:
Expand All @@ -59,12 +59,14 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v2.22.0
uses: pypa/cibuildwheel@v3.1.4
env:
CIBW_ARCHS_LINUX: "x86_64 i686"
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
CIBW_SKIP: "cp36-* *-musllinux_* pp* *-*linux_{aarch64,ppc64le}"
CIBW_SKIP: "cp38-* *-musllinux_* *-*linux_{aarch64,ppc64le}"
CIBW_REPAIR_WHEEL_COMMAND_LINUX:
auditwheel repair
--exclude libdb2.so.1
Expand All @@ -86,17 +88,17 @@ jobs:

build_wheels_macos_arm64:
name: Build wheels on macOS ARM64
runs-on: macos-14
runs-on: macos-latest
strategy:
matrix:
architecture: [arm64]

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v2.22.0
uses: pypa/cibuildwheel@v3.1.4
env:
CIBW_SKIP: "cp36-* cp37-* cp38-* pp*"
CIBW_SKIP: "cp38-*"
MACOSX_DEPLOYMENT_TARGET: 14.0

- uses: actions/upload-artifact@v4.4.3
Expand All @@ -106,17 +108,18 @@ jobs:

build_wheels_macos_x86:
name: Build wheels for macOS x86_64
runs-on: macos-13
runs-on: macos-15-intel
strategy:
matrix:
architecture: [x86_64]

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v2.22.0
uses: pypa/cibuildwheel@v3.1.4
env:
CIBW_SKIP: "cp36-* pp*"
CIBW_ARCHS: "x86_64"
CIBW_SKIP: "cp38-*"
MACOSX_DEPLOYMENT_TARGET: 10.15

- uses: actions/upload-artifact@v4.4.3
Expand All @@ -128,7 +131,7 @@ jobs:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5
- name: Install Python dependencies
run: python -m pip install --upgrade pip build
- name: Build sdist
Expand Down Expand Up @@ -170,7 +173,7 @@ jobs:
#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
- uses: actions/download-artifact@v5
with:
path: dist
pattern: ibmdb-*
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ https://github.com/ibmdb/python-ibmdb/wiki/APIs

## Pre-requisites

Install Python 3.7 <= 3.13. The minimum python version supported by driver is python 3.7 and the latest version supported is python 3.13.
Install Python 3.9 <= 3.14. The minimum python version supported by driver is python 3.9 and the latest version supported is python 3.14.
MacOS arm64 is supported Python 3.9 onwards.

### To install ibm_db on z/OS system
Expand Down
4 changes: 2 additions & 2 deletions ibm_db.c
Original file line number Diff line number Diff line change
Expand Up @@ -7881,9 +7881,9 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
#endif
curr->svalue = PyBytes_AsString(tempobj);
curr->ivalue = strlen(curr->svalue);
curr->svalue = memcpy(PyMem_Malloc((sizeof(char)) * (curr->ivalue + 1)), curr->svalue, curr->ivalue);
size_t alloc_size = (curr->param_size > curr->ivalue) ? curr->param_size : curr->ivalue;
curr->svalue = memcpy(PyMem_Malloc((sizeof(char)) * (alloc_size + 1)), curr->svalue, curr->ivalue);
curr->svalue[curr->ivalue] = '\0';
curr->bind_indicator = curr->ivalue;
snprintf(messageStr, sizeof(messageStr),
"Processing single value: svalue=%s, ivalue=%d, bind_indicator=%d", curr->svalue, curr->ivalue, curr->bind_indicator);
LogMsg(DEBUG, messageStr);
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,12 @@ def print_exception( e, url):
'Operating System :: MacOS',
'Operating System :: MacOS :: MacOS X',
'Programming Language :: Python',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: 3.14',
'Topic :: Database :: Front-Ends'],

long_description = open(readme).read(),
Expand Down