diff --git a/packaging/python/build_requirements.txt b/packaging/python/build_requirements.txt index dcbd639f9c..ffb508170f 100644 --- a/packaging/python/build_requirements.txt +++ b/packaging/python/build_requirements.txt @@ -1,2 +1,4 @@ cython<3 packaging +build +setuptools_scm diff --git a/packaging/python/build_wheels.bash b/packaging/python/build_wheels.bash index 007fa581ce..0c6cab0f10 100755 --- a/packaging/python/build_wheels.bash +++ b/packaging/python/build_wheels.bash @@ -103,7 +103,18 @@ build_wheel_linux() { # Workaround for https://github.com/pypa/manylinux/issues/1309 git config --global --add safe.directory "*" - python setup.py build_ext --cmake-prefix="/nrnwheel/ncurses;/nrnwheel/readline" --cmake-defs="$CMAKE_DEFS" $setup_args bdist_wheel + if [ -n "${setup_args}" ]; then + python -m build --wheel --no-isolation \ + --config-setting="--global-option=build_ext" \ + --config-setting="--global-option=${setup_args}" \ + --config-setting="--global-option=--cmake-defs=${CMAKE_DEFS}" \ + --config-setting='--global-option=--cmake-prefix="/nrnwheel/ncurses;/nrnwheel/readline"' + else + python -m build --wheel --no-isolation \ + --config-setting="--global-option=build_ext" \ + --config-setting="--global-option=--cmake-defs=${CMAKE_DEFS}" \ + --config-setting='--global-option=--cmake-prefix="/nrnwheel/ncurses;/nrnwheel/readline"' + fi # For CI runs we skip wheelhouse repairs if [ "$SKIP_WHEELHOUSE_REPAIR" = true ] ; then @@ -175,7 +186,18 @@ build_wheel_osx() { fi fi - python setup.py build_ext --cmake-prefix="/opt/nrnwheel/ncurses;/opt/nrnwheel/readline;/usr/x11" --cmake-defs="$CMAKE_DEFS" $setup_args bdist_wheel + if [ -n "${setup_args}" ]; then + python -m build --wheel --no-isolation \ + --config-setting="--global-option=build_ext" \ + --config-setting="--global-option=${setup_args}" \ + --config-setting="--global-option=--cmake-defs=${CMAKE_DEFS}" \ + --config-setting='--global-option=--cmake-prefix="/opt/nrnwheel/ncurses;/opt/nrnwheel/readline;/usr/x11"' + else + python -m build --wheel --no-isolation \ + --config-setting="--global-option=build_ext" \ + --config-setting="--global-option=--cmake-defs=${CMAKE_DEFS}" \ + --config-setting='--global-option=--cmake-prefix="/opt/nrnwheel/ncurses;/opt/nrnwheel/readline;/usr/x11"' + fi echo " - Calling delocate-listdeps" delocate-listdeps dist/*.whl