test release to testpypi 3.2.6.10

Author: Earammak

.github/workflows/bld_wheels_and_upload.yml

@@ -1,11 +1,12 @@
-name: Build and upload to PyPI
+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
+      - fix_dll_error_issue
   # Sequence of patterns matched against refs/tags
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
@@ -26,7 +27,10 @@ jobs:
           CIBW_BUILD: "*-win_amd64"
           CIBW_SKIP: "cp38-*"
 
-      - uses: actions/upload-artifact@v4.4.3
+      - name: Inject ibm_db_dll.pth into wheels
+        run: python scripts/inject_pth_into_wheel.py wheelhouse
+
+      - uses: actions/upload-artifact@v4
         with:
           name: ibmdb-wheels64-${{ matrix.os }}
           path: wheelhouse/*.whl
@@ -46,7 +50,10 @@ jobs:
           CIBW_BUILD: "*-win32"
           CIBW_SKIP: "cp38-*"
 
-      - uses: actions/upload-artifact@v4.4.3
+      - name: Inject ibm_db_dll.pth into wheels
+        run: python scripts/inject_pth_into_wheel.py wheelhouse
+
+      - uses: actions/upload-artifact@v4
         with:
           name: ibmdb-wheels32-${{ matrix.os }}
           path: wheelhouse/*.whl
@@ -81,7 +88,7 @@ jobs:
               --wheel-dir {dest_dir}
               {wheel}
 
-      - uses: actions/upload-artifact@v4.4.3
+      - uses: actions/upload-artifact@v4
         with:
           name: ibmdb-wheels-${{ matrix.os }}
           path: wheelhouse/*.whl
@@ -101,7 +108,7 @@ jobs:
           CIBW_SKIP: "cp38-*"
           MACOSX_DEPLOYMENT_TARGET: 14.0
 
-      - uses: actions/upload-artifact@v4.4.3
+      - uses: actions/upload-artifact@v4
         with:
           name: ibmdb-wheelsarm64
           path: wheelhouse/*.whl
@@ -122,7 +129,7 @@ jobs:
           CIBW_SKIP: "cp38-*"
           MACOSX_DEPLOYMENT_TARGET: 10.15
 
-      - uses: actions/upload-artifact@v4.4.3
+      - uses: actions/upload-artifact@v4
         with:
           name: ibmdb-wheelsx86-${{ matrix.os }}
           path: wheelhouse/*.whl
@@ -136,26 +143,19 @@ jobs:
         run: python -m pip install --upgrade pip build
       - name: Build sdist
         run: python -m build --sdist --no-isolation
-      - name: Package version 
-        id: version
-        run: |
-           cd dist
-           pip install ibm_db*
-           echo "VERSION=$(python -c 'import ibm_db; print(ibm_db.__version__)')" >> $GITHUB_OUTPUT
-      - name: Build source distribution
+      - name: Remove clidriver from sdist
         run: |
-          PACKAGE="ibm_db-$VERSION"
           cd dist
-          tar -xzf $PACKAGE.tar.gz
-          rm -rf $PACKAGE/clidriver*
-          rm -rf $PACKAGE.tar.gz
-          tar -czf $PACKAGE.tar.gz $PACKAGE
-          rm -rf $PACKAGE
-        env:
-          VERSION: ${{ steps.version.outputs.VERSION}}
+          TARBALL=$(ls ibm?db-*.tar.gz | head -1)
+          DIRNAME="${TARBALL%.tar.gz}"
+          tar -xzf "$TARBALL"
+          rm -rf "$DIRNAME"/clidriver*
+          rm -rf "$TARBALL"
+          tar -czf "$TARBALL" "$DIRNAME"
+          rm -rf "$DIRNAME"
 
       - name: Upload sdist
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4
         with:
           name: ibmdb-sdist
           path: dist/*.tar.gz
@@ -182,3 +182,24 @@ jobs:
     - name: Publish distribution to PyPI
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1.12
+
+  upload_testpypi:
+    needs: [build_wheels_windows_64, build_wheels_windows_32, build_wheels_linux, build_wheels_macos_arm64, build_wheels_macos_x86, build_sdist]
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+
+    #upload to TestPyPI on push to test_dll_issue branch
+    if: github.event_name == 'push' && github.ref == 'refs/heads/test_dll_issue'
+    steps:
+    - uses: actions/download-artifact@v5
+      with:
+        path: dist
+        pattern: ibmdb-*
+        merge-multiple: true
+
+    - name: Publish distribution to TestPyPI
+      uses: pypa/gh-action-pypi-publish@release/v1.12
+      with:
+        repository-url: https://test.pypi.org/legacy/
+        verbose: true

MANIFEST.in

@@ -1,6 +1,8 @@
 include ibm_db.h ibm_db.c
 include CHANGES.md LICENSE README.md
 include config.py.sample
+include ibm_db_dll.pth
+include _ibm_db_register_dll.py
 recursive-include ibm_db_tests *.py *.png *.jpg
 include MANIFEST.in
 recursive-include clidriver *

_ibm_db_register_dll.py

@@ -0,0 +1,38 @@
+# Auto-generated by ibm_db setup.py
+# Registers clidriver DLL directory for Python 3.8+ on Windows.
+# This module is imported at startup via ibm_db_dll.pth.
+import os, sys, site, sysconfig
+
+if sys.platform == "win32" and hasattr(os, "add_dll_directory"):
+    candidates = []
+
+    # 1. IBM_DB_HOME environment variable (highest priority)
+    ibm_home = os.environ.get("IBM_DB_HOME")
+    if ibm_home:
+        candidates.append(os.path.join(ibm_home.strip('"'), "bin"))
+
+    # 2. User site-packages/clidriver (pip install --user)
+    try:
+        usp = site.getusersitepackages()
+        if usp:
+            candidates.append(os.path.join(usp, "clidriver", "bin"))
+    except Exception:
+        pass
+
+    # 3. System site-packages/clidriver (standard pip install)
+    candidates.append(
+        os.path.join(sysconfig.get_path("purelib"), "clidriver", "bin")
+    )
+
+    # 4. PATH entries that look like DB2/clidriver installs
+    for d in os.environ.get("PATH", "").split(";"):
+        if d and os.path.basename(d).lower() == "bin":
+            if (os.path.isfile(os.path.join(d, "db2cli.exe")) or
+                    os.path.isdir(os.path.join(os.path.dirname(d), "license"))):
+                candidates.append(d)
+
+    # Register the first valid DLL directory
+    for p in candidates:
+        if p and os.path.isdir(p):
+            os.add_dll_directory(p)
+            break

ibm_db.c

@@ -22,7 +22,7 @@
 +--------------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "3.2.8"
+#define MODULE_RELEASE "3.2.6.10"
 
 #include <Python.h>
 #include <datetime.h>

ibm_db_dll.pth

@@ -0,0 +1 @@
+import _ibm_db_register_dll

scripts/inject_pth_into_wheel.py

@@ -0,0 +1,80 @@
+"""Inject ibm_db_dll.pth into a wheel so it lands in site-packages on install.
+
+Usage: python scripts/inject_pth_into_wheel.py <wheel_dir>
+
+Wheels are zip files. Files at the root level of a wheel (alongside .py
+modules) are installed to site-packages. This script adds ibm_db_dll.pth
+to every .whl file in the given directory.
+"""
+import os, sys, hashlib, base64, zipfile, glob, tempfile, shutil
+
+PTH_FILENAME = 'ibm_db_dll.pth'
+PTH_CONTENT = 'import _ibm_db_register_dll\n'
+
+
+def _record_line(name, content_bytes):
+    """Build a RECORD entry: name,sha256=<digest>,<length>"""
+    digest = hashlib.sha256(content_bytes).digest()
+    b64 = base64.urlsafe_b64encode(digest).rstrip(b'=').decode('ascii')
+    return f'{name},sha256={b64},{len(content_bytes)}'
+
+
+def inject_pth(whl_path):
+    """Add ibm_db_dll.pth to a wheel file and remove any misplaced copies."""
+    with zipfile.ZipFile(whl_path, 'r') as zin:
+        names = zin.namelist()
+        # Skip if the .pth file is already at the wheel root
+        if PTH_FILENAME in names:
+            print(f'  {PTH_FILENAME} already at root of {os.path.basename(whl_path)}, skipping')
+            return
+
+    tmp_fd, tmp_path = tempfile.mkstemp(suffix='.whl')
+    os.close(tmp_fd)
+
+    pth_bytes = PTH_CONTENT.encode('utf-8')
+    pth_record = _record_line(PTH_FILENAME, pth_bytes)
+
+    with zipfile.ZipFile(whl_path, 'r') as zin, \
+         zipfile.ZipFile(tmp_path, 'w', zipfile.ZIP_DEFLATED) as zout:
+
+        for item in zin.infolist():
+            # Drop any misplaced copies of the .pth file (absolute-path junk from data_files)
+            if item.filename != PTH_FILENAME and item.filename.endswith('/' + PTH_FILENAME):
+                print(f'  Removing misplaced {item.filename}')
+                continue
+
+            data = zin.read(item.filename)
+
+            # Append our .pth entry to the RECORD file
+            if item.filename.endswith('/RECORD'):
+                data = data.rstrip(b'\n') + b'\n' + pth_record.encode('utf-8') + b'\n'
+
+            zout.writestr(item, data)
+
+        # Add the .pth file at the wheel root
+        zout.writestr(PTH_FILENAME, pth_bytes)
+
+    shutil.move(tmp_path, whl_path)
+    print(f'  Injected {PTH_FILENAME} into {os.path.basename(whl_path)}')
+
+
+def main():
+    if len(sys.argv) != 2:
+        print(f'Usage: {sys.argv[0]} <wheel_dir>')
+        sys.exit(1)
+
+    wheel_dir = sys.argv[1]
+    wheels = glob.glob(os.path.join(wheel_dir, '*.whl'))
+
+    if not wheels:
+        print(f'No .whl files found in {wheel_dir}')
+        sys.exit(1)
+
+    for whl in wheels:
+        inject_pth(whl)
+
+    print(f'Done: processed {len(wheels)} wheel(s)')
+
+
+if __name__ == '__main__':
+    main()

setup.py

@@ -28,10 +28,11 @@
     from distutils.sysconfig import get_python_lib
 from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
+from setuptools.command.build_py import build_py
 from setuptools.command.install import install
 
 PACKAGE = 'ibm_db'
-VERSION = '3.2.8'
+VERSION = '3.2.6.10'
 LICENSE = 'Apache License 2.0'
 readme = os.path.join(os.path.dirname(__file__),'README.md')
 
@@ -501,7 +502,7 @@ def print_exception( e, url):
                (get_python_lib(), ['./LICENSE']),
                (get_python_lib(), ['./config.py.sample'])]
 
-modules = ['ibm_db_dbi', 'testfunctions', 'ibmdb_tests', 'ibm_db_ctx']
+modules = ['ibm_db_dbi', 'testfunctions', 'ibmdb_tests', 'ibm_db_ctx', '_ibm_db_register_dll']
 
 if 'zos' == sys.platform:
     ext_modules = _ext_modules(os.path.join(os.getcwd(), include_dir), library, ibm_db_lib, ibm_db_lib_runtime)
@@ -525,6 +526,18 @@ def print_exception( e, url):
            _checkGcc()
            _checkPythonHeaderFile()
 
+# Custom build_py to include ibm_db_dll.pth at the wheel root
+# so it lands in site-packages and triggers DLL registration on startup.
+class _build_py_with_pth(build_py):
+    def run(self):
+        super().run()
+        pth_src = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'ibm_db_dll.pth')
+        if os.path.isfile(pth_src):
+            pth_dst = os.path.join(self.build_lib, 'ibm_db_dll.pth')
+            self.copy_file(pth_src, pth_dst)
+
+cmd_class['build_py'] = _build_py_with_pth
+
 #'Operating System :: z/OS', pypi upload fails with error - Not a valid classifier
 setup( name    = PACKAGE,
     version = VERSION,