Add setuptools to actions python setup

LLNL · Dec 7, 2023 · 26dd2e9 · 26dd2e9
1 parent c7f329a
commit 26dd2e9
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/debug-linux.yml b/.github/workflows/debug-linux.yml
@@ -19,6 +19,7 @@ jobs:
           run: |
             python -m pip install cython
             python -m pip install oldest-supported-numpy
+            python -m pip install setuptools
 
         - name: Install OpenMP
           run: |

diff --git a/.github/workflows/debug-macos.yml b/.github/workflows/debug-macos.yml
@@ -19,6 +19,7 @@ jobs:
           run: |
             python -m pip install cython
             python -m pip install oldest-supported-numpy
+            python -m pip install setuptools
 
         - name: Install OpenMP
           run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -49,6 +49,7 @@ jobs:
         run: |
           python -m pip install cython
           python -m pip install oldest-supported-numpy
+          python -m pip install setuptools
       
       - name: Setup OpenMP (Linux)
         if: ${{matrix.os == 'ubuntu-latest' && matrix.cxx_compiler == 'clang++'}}

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_policy(SET CMP0148 OLD)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/scikit-build-cmake)
 include(UseCython)
 include(FindPythonExtensions)

diff --git a/python/scikit-build-cmake/FindCython.cmake b/python/scikit-build-cmake/FindCython.cmake
@@ -37,8 +37,6 @@
 # Use the Cython executable that lives next to the Python executable
 # if it is a local installation.
 
-cmake_policy(SET CMP0148 OLD)
-
 find_package(PythonInterp)
 if(PYTHONINTERP_FOUND)
   execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from os import path; import cython; print(path.dirname(cython.__file__))"

diff --git a/python/scikit-build-cmake/FindNumPy.cmake b/python/scikit-build-cmake/FindNumPy.cmake
@@ -21,8 +21,6 @@
 # ``NumPy_INCLUDE_DIR``
 #
 
-cmake_policy(SET CMP0148 OLD)
-
 if(NOT NumPy_FOUND)
   set(_find_extra_args)
   if(NumPy_FIND_REQUIRED)

diff --git a/python/scikit-build-cmake/FindPythonExtensions.cmake b/python/scikit-build-cmake/FindPythonExtensions.cmake
@@ -244,8 +244,6 @@
 # limitations under the License.
 #=============================================================================
 
-cmake_policy(SET CMP0148 OLD)
-
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibs)
 include(targetLinkLibrariesWithDynamicLookup)

diff --git a/python/scikit-build-cmake/UseCython.cmake b/python/scikit-build-cmake/UseCython.cmake
@@ -94,8 +94,6 @@
 # limitations under the License.
 #=============================================================================
 
-cmake_policy(SET CMP0148 OLD)
-
 # Configuration options.
 set(CYTHON_ANNOTATE OFF
     CACHE BOOL "Create an annotated .html file when compiling *.pyx.")

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_policy(SET CMP0148 OLD)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/python/scikit-build-cmake)
 
 find_package(PythonInterp REQUIRED)