diff --git a/.github/actions/build-py/action.yml b/.github/actions/build-py/action.yml index 941eded182..2cb89fa75d 100644 --- a/.github/actions/build-py/action.yml +++ b/.github/actions/build-py/action.yml @@ -9,7 +9,7 @@ runs: steps: - name: Install dependencies shell: bash - run: yum install ninja-build -qy + run: yum install ninja-build cmake git -qy - name: Make artifact dir shell: bash run: | @@ -19,8 +19,10 @@ runs: shell: bash run: | cd pycode/memilio-${{ inputs.package }}/ - /opt/python/cp38-cp38/bin/python setup.py bdist_wheel - /opt/python/cp311-cp311/bin/python setup.py bdist_wheel + /opt/python/cp38-cp38/bin/python -m pip install scikit-build + /opt/python/cp38-cp38/bin/python -m build --no-isolation --wheel + /opt/python/cp311-cp311/bin/python -m pip install scikit-build + /opt/python/cp311-cp311/bin/python -m build --no-isolation --wheel # Exclude memilio-generation, because its a pure python package, cmake is only used in the build process to retrieve data from cpp if [[ -f "CMakeLists.txt" ]] && [ "${{ inputs.package }}" != "generation" ]; then # includes native dependencies in the wheel @@ -35,4 +37,3 @@ runs: with: name: python-wheels-${{ inputs.package }} path: pycode/wheelhouse - diff --git a/pycode/memilio-generation/setup.py b/pycode/memilio-generation/setup.py index 9237035c47..2d3370d80e 100644 --- a/pycode/memilio-generation/setup.py +++ b/pycode/memilio-generation/setup.py @@ -25,7 +25,6 @@ description='Part of MEmilio project, automatic generation of model specific python bindings.', packages=find_packages( where=os.path.dirname(os.path.abspath(__file__))), - setup_requires=['cmake'], install_requires=['libclang==18.1.1', 'dataclasses', 'dataclasses_json', 'graphviz', 'importlib-resources>=1.1.0; python_version < \'3.9\''], extras_require={'dev': []}, diff --git a/pycode/memilio-simulation/setup.py b/pycode/memilio-simulation/setup.py index b4038394bf..037a93df8e 100644 --- a/pycode/memilio-simulation/setup.py +++ b/pycode/memilio-simulation/setup.py @@ -21,7 +21,6 @@ url='https://github.com/SciCompMod/memilio', description='Part of MEmilio project, python bindings to the C++ libraries that contain the models and simulations.', packages=find_packages(where=os.path.dirname(os.path.abspath(__file__))), - setup_requires=['cmake'], # need shared libs so there is one shared log level cmake_args=['-DMEMILIO_BUILD_SHARED_LIBS:BOOL=ON'], install_requires=[