CI/Builds: various updates

PMeira · PMeira · commit ab9977238c5e · 2026-02-19T01:22:42.000-03:00
- Try installing the resulting wheel on all platforms, and importing `_fastdss`.
- Allow building with any NumPy 2.x.
- Allow Linux x86 to run the import test.
- Testing tweaks to macOS builds.
- Add missing LICENSE.LGPL3
- Migrate from calling setup.py directly to `python -m build`; somewhat supports build isolation.
- Fixing macOS rpath

Windows x86/32-bit is temporarily disabled since the wheel is failing.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -3,7 +3,7 @@ name: Builds
 # TODO: generalize steps
 
 env:
-  DSS_CAPI_TAG: '0.15.0b1'
+  DSS_CAPI_TAG: '0.15.0b2'
   ARTIFACTS_FOLDER: '${{ github.workspace }}/artifacts'
 
 on: 
@@ -33,7 +33,7 @@ jobs:
             conda_subdir: 'linux-64'
 
           - arch: x86
-            docker_image: 'pmeira/manylinux_wheel_fpc322_i686'
+            docker_image: 'quay.io/pypa/manylinux_2_34_i686'
             dss_extensions_linux32: linux32
             gh_image: ubuntu-latest
             manylinux-base: 'manylinux2014'
@@ -89,7 +89,7 @@ jobs:
           name: 'packages-linux_${{ matrix.arch }}-${{ matrix.manylinux-base }}'
           path: '${{ github.workspace }}/artifacts'
       - name: Try installing the wheel
-        if: ${{ matrix.arch != 'x86' }}
+        continue-on-error: ${{ matrix.arch == 'x86' }}
         run: |
           docker run -e GITHUB_SHA -e GITHUB_REF -e DSS_CAPI_PATH=/build/dss_capi -v "${PWD}:/build" -w /build $DOCKER_IMAGE ${{ matrix.dss_extensions_linux32}} bash /build/dss_python_backend/ci/test_wheel.sh
 
@@ -101,6 +101,7 @@ jobs:
       DSS_CAPI_PATH: '${{ github.workspace }}/dss_capi'
       #SDKROOT: '${{ github.workspace }}/MacOSX10.13.sdk'
       PYTHON: python
+      MACOSX_DEPLOYMENT_TARGET: "11.0"
     steps:
       - uses: actions/checkout@v3
         with: 
@@ -137,18 +138,25 @@ jobs:
         with:
           name: 'packages-darwin_x64'
           path: '${{ github.workspace }}/artifacts'
+      - name: Try installing the wheel
+        continue-on-error: true
+        shell: bash
+        run: |
+          python -m pip install artifacts/dss_python_backend-*.whl
+          python -c 'from dss_python_backend import lib, ffi; lib.DSS_NewCircuit(ffi.NULL, b"test123"); assert ffi.string(lib.Circuit_Get_Name(ffi.NULL)) == b"test123"'
+          python -c 'from dss_python_backend import _fastdss'
 
   build_macos_arm64:
     name: 'macOS ARM64'
     continue-on-error: false
-    runs-on: 'macos-latest'
+    runs-on: 'macos-15'
     env:
       DSS_CAPI_PATH: '${{ github.workspace }}/dss_capi'
       # SDKROOT: '${{ github.workspace }}/MacOSX10.13.sdk'
       PYTHON: python
       _PYTHON_HOST_PLATFORM: macosx-11.0-arm64
       ARCHFLAGS: '-arch arm64'
-
+      MACOSX_DEPLOYMENT_TARGET: "11.0"
     steps:
       - uses: actions/checkout@v3
         with: 
@@ -185,6 +193,13 @@ jobs:
         with:
           name: 'packages-darwin_arm64'
           path: '${{ github.workspace }}/artifacts'
+      - name: Try installing the wheel
+        continue-on-error: true
+        shell: bash
+        run: |
+          python -m pip install artifacts/dss_python_backend-*.whl
+          python -c 'from dss_python_backend import lib, ffi; lib.DSS_NewCircuit(ffi.NULL, b"test123"); assert ffi.string(lib.Circuit_Get_Name(ffi.NULL)) == b"test123"'
+          python -c 'from dss_python_backend import _fastdss'
 
   build_win_x64:
     name: 'Windows x64'
@@ -219,9 +234,18 @@ jobs:
         with:
           name: 'packages-win_x64'
           path: '${{ github.workspace }}/artifacts'
+      - name: Try installing the wheel
+        continue-on-error: true
+        shell: bash
+        run: |
+          python -m pip install artifacts/dss_python_backend-*.whl
+          python -c "from dss_python_backend import lib, ffi; lib.DSS_NewCircuit(ffi.NULL, b'test123'); assert ffi.string(lib.Circuit_Get_Name(ffi.NULL)) == b'test123'"
+          python -c "from dss_python_backend import _fastdss"
+
 
   build_win_x86:
     name: 'Windows x86'
+    if: false
     continue-on-error: false
     runs-on: windows-2022
     env:
@@ -254,6 +278,13 @@ jobs:
         with:
           name: 'packages-win_x86'
           path: '${{ github.workspace }}/artifacts'
+      - name: Try installing the wheel
+        continue-on-error: true
+        shell: bash
+        run: |
+          python -m pip install artifacts/dss_python_backend-*.whl
+          python -c "from dss_python_backend import lib, ffi; lib.DSS_NewCircuit(ffi.NULL, b'test123'); assert ffi.string(lib.Circuit_Get_Name(ffi.NULL)) == b'test123'"
+          python -c "from dss_python_backend import _fastdss"
 
   merge:
     name: 'Merge build artifacts'
diff --git a/LICENSE.LGPL3 b/LICENSE.LGPL3
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
@@ -3,8 +3,9 @@ export PATH=/opt/python/cp311-cp311/bin/:$PATH
 # export DSS_PYTHON_BACKEND_MANYLINUX=1
 
 cd dss_python_backend
-python3 -m pip install --user --upgrade pip setuptools packaging trove-classifiers cffi wheel numpy==2
-python3 setup.py --quiet bdist_wheel --py-limited-api cp37 --dist-dir="../artifacts_raw"
+python3 -m pip install --user --upgrade pip setuptools packaging trove-classifiers cffi wheel 'numpy>=2,<3' build
+# python3 setup.py --quiet bdist_wheel --py-limited-api cp37 --dist-dir="../artifacts_raw"
+python3 -m build --wheel --outdir="../artifacts_raw"
 cd ..
 
 # Bundle external shared libraries into the wheels
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -1,4 +1,5 @@
 mkdir -p artifacts
 cd dss_python_backend
-$PYTHON -m pip install --upgrade pip setuptools packaging trove-classifiers cffi wheel numpy==2
-$PYTHON setup.py --quiet bdist_wheel --py-limited-api cp37 --dist-dir=$ARTIFACTS_FOLDER
+$PYTHON -m pip install --upgrade pip setuptools packaging trove-classifiers cffi wheel 'numpy>=2,<3' build
+# $PYTHON setup.py --quiet bdist_wheel --py-limited-api cp37 --dist-dir=$ARTIFACTS_FOLDER
+$PYTHON -m build --wheel --outdir="$ARTIFACTS_FOLDER"
diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh
@@ -3,12 +3,13 @@
 set -e -x
 
 ORIGINAL_PATH=$PATH
-PYTHON_DIRS="cp311-cp311 cp312-cp312"
+PYTHON_DIRS="cp312-cp312 cp313-cp313 cp314-cp314"
 
 for pydir in $PYTHON_DIRS
 do
     echo Installing for CPython $pydir
     export PATH=/opt/python/${pydir}/bin/:$ORIGINAL_PATH
     python -m pip install artifacts/dss_python_backend-*.whl
     python -c 'from dss_python_backend import lib, ffi; lib.DSS_NewCircuit(ffi.NULL, b"test123"); assert ffi.string(lib.Circuit_Get_Name(ffi.NULL)) == b"test123"'
+    python -c 'from dss_python_backend import _fastdss'
 done
diff --git a/dss_build.py b/dss_build.py
@@ -128,6 +128,9 @@ def process_header(src, extern_py=False, implement_py=False, prefix='', flags=No
     # Due to some specifics on Windows, we need to skip the lib included via pragma
     python3xx_lib = f"python{sys.version_info.major}{sys.version_info.minor}.lib"
     extra['extra_link_args'] = [f"/NODEFAULTLIB:{python3xx_lib}"]
+elif sys.platform == 'darwin':
+    extra['extra_link_args'] = ["-Wl,-rpath,@loader_path/."]
+
 
 ffi_builders = {}    
 
diff --git a/dss_python_backend/__init__.py b/dss_python_backend/__init__.py
@@ -56,5 +56,5 @@
 # CffiApiUtil so we call it as soon as the DLL/so is loaded.
 lib.DSS_Start(ffi.NULL, 0)
 
-__version__ = '0.15.0b1'
+__version__ = '0.15.0b2'
 __all__ = ['ffi', 'lib', 'loader_lib']
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,5 +38,5 @@ Repository = "https://github.com/dss-extensions/dss_python_backend.git"
 "Bug Tracker" = "https://github.com/dss-extensions/dss-extensions/issues"
 
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools", "numpy>=2,<3", "cffi"]
 build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,5 @@
 [metadata]
 description_file = README.md
-license_files = LICENSE
 url = https://github.com/dss-extensions/dss_python_backend/
 
 [bdist_wheel]
diff --git a/setup.py b/setup.py
@@ -1,7 +1,9 @@
 from setuptools import setup
-import re, shutil, os, io
+import re, shutil, os, io, sys, glob
+
+sys.path.insert(0, os.path.dirname(__file__))
+
 from dss_setup_common import PLATFORM_FOLDER, DLL_SUFFIX
-import glob
 import dss_build
 
 SKIP_COPY = os.environ.get('DSS_PYTHON_BACKEND_SKIP_COPY', '0') == '1'
@@ -81,7 +83,7 @@
 
 setup(
     version=package_version,
-    packages=['dss_python_backend'],
+    packages=['dss_python_backend', 'dss_python_backend.include'],
     setup_requires=["cffi>=2.0.0"],
     cffi_modules= [
         "dss_build.py:ffi_builder_dss",
