diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5e8231b..d6db1ca 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,6 +22,6 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.x" - name: Test installation run: export FRI_CLIENT_VERSION=${{ matrix.fri_version }} && pip3 install . diff --git a/CMakeLists.txt b/CMakeLists.txt index f4c830d..31c9bdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,8 @@ set(FRI_BUILD_EXAMPLES OFF) set(FRI_CLIENT_VERSION_MAJOR 1 CACHE STRING "The FRI client major version." FORCE) set(FRI_CLIENT_VERSION_MINOR 15 CACHE STRING "The FRI client minor version." FORCE) +find_package(Python 3.10 COMPONENTS NumPy REQUIRED) + # fetch the fri depending on the version FetchContent_Declare( FRI @@ -35,4 +37,4 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/pyFRI/src ) -target_link_libraries(_pyFRI PRIVATE FRIClient) +target_link_libraries(_pyFRI PRIVATE FRIClient Python::NumPy) diff --git a/setup.py b/setup.py index 16cde53..a6ce150 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ def __init__(self, msg): "win-arm64": "ARM64", } - # A CMakeExtension needs a sourcedir instead of a file list. # The name must be the _single_ output extension from the CMake build. # If you need multiple extensions, see scikit-build. @@ -144,8 +143,8 @@ def build_extension(self, ext: CMakeExtension) -> None: setup( name="pyFRI", version="1.2.0", - author="Christopher E. Mower", - author_email="christopher.mower@kcl.ac.uk", + author="Christopher E. Mower, Martin Huber", + author_email="christopher.mower@kcl.ac.uk, m.huber_1994@hotmail.de", description="Python bindings for the FRI Client SDK library.", long_description="", packages=find_packages(),