Trigger testpypi publish 3.2.6.8

Author: Earammak

.github/workflows/bld_wheels_and_upload.yml

@@ -27,6 +27,9 @@ jobs:
           CIBW_BUILD: "*-win_amd64"
           CIBW_SKIP: "cp38-*"
 
+      - name: Inject ibm_db_dll.pth into wheels
+        run: python scripts/inject_pth_into_wheel.py wheelhouse
+
       - uses: actions/upload-artifact@v4.4.3
         with:
           name: ibmdb-wheels64-${{ matrix.os }}
@@ -47,6 +50,9 @@ jobs:
           CIBW_BUILD: "*-win32"
           CIBW_SKIP: "cp38-*"
 
+      - name: Inject ibm_db_dll.pth into wheels
+        run: python scripts/inject_pth_into_wheel.py wheelhouse
+
       - uses: actions/upload-artifact@v4.4.3
         with:
           name: ibmdb-wheels32-${{ matrix.os }}

ibm_db.c

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

scripts/inject_pth_into_wheel.py

@@ -10,7 +10,6 @@
 
 PTH_FILENAME = 'ibm_db_dll.pth'
 PTH_CONTENT = 'import _ibm_db_register_dll\n'
-REGISTER_MODULE = '_ibm_db_register_dll.py'
 
 
 def _record_line(name, content_bytes):
@@ -21,43 +20,42 @@ def _record_line(name, content_bytes):
 
 
 def inject_pth(whl_path):
-    """Add ibm_db_dll.pth and _ibm_db_register_dll.py to a wheel file."""
-    # Skip if already injected
+    """Add ibm_db_dll.pth to a wheel file and remove any misplaced copies."""
     with zipfile.ZipFile(whl_path, 'r') as zin:
-        if PTH_FILENAME in zin.namelist():
-            print(f'  {PTH_FILENAME} already in {os.path.basename(whl_path)}, skipping')
+        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
 
-    # Read the register module from the repo root
-    register_module_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), REGISTER_MODULE)
-    with open(register_module_path, 'rb') as f:
-        register_bytes = f.read()
-
     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)
-    register_record = _record_line(REGISTER_MODULE, register_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 entries to the RECORD file
+            # 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' + register_record.encode('utf-8') + b'\n'
+                data = data.rstrip(b'\n') + b'\n' + pth_record.encode('utf-8') + b'\n'
 
             zout.writestr(item, data)
 
-        # Add the .pth file and register module at the wheel root
+        # Add the .pth file at the wheel root
         zout.writestr(PTH_FILENAME, pth_bytes)
-        zout.writestr(REGISTER_MODULE, register_bytes)
 
     shutil.move(tmp_path, whl_path)
-    print(f'  Injected {PTH_FILENAME} and {REGISTER_MODULE} into {os.path.basename(whl_path)}')
+    print(f'  Injected {PTH_FILENAME} into {os.path.basename(whl_path)}')
 
 
 def main():

setup.py

@@ -499,8 +499,7 @@ def print_exception( e, url):
 data_files = [ (get_python_lib(), ['./README.md']),
                (get_python_lib(), ['./CHANGES.md']),
                (get_python_lib(), ['./LICENSE']),
-               (get_python_lib(), ['./config.py.sample']),
-               (get_python_lib(), ['./ibm_db_dll.pth'])]
+               (get_python_lib(), ['./config.py.sample'])]
 
 modules = ['ibm_db_dbi', 'testfunctions', 'ibmdb_tests', 'ibm_db_ctx', '_ibm_db_register_dll']