From 060da1a557dcf991a8b75acaf4a9d192a2d6b4d4 Mon Sep 17 00:00:00 2001 From: Robert Cimrman Date: Wed, 19 Nov 2025 13:38:21 +0100 Subject: [PATCH 1/2] fix python3 interpreter name for systems having both python and python3 --- cmake/FindNumPy.cmake | 4 +++- cmake/FindPython.cmake | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/FindNumPy.cmake b/cmake/FindNumPy.cmake index 2613bf1..8e15ab5 100644 --- a/cmake/FindNumPy.cmake +++ b/cmake/FindNumPy.cmake @@ -1,5 +1,7 @@ +find_package(Python3 REQUIRED COMPONENTS Interpreter) + execute_process( - COMMAND python -c "import numpy; print(numpy.get_include())" + COMMAND ${Python3_EXECUTABLE} -c "import numpy; print(numpy.get_include())" OUTPUT_VARIABLE PYTHON_SYS_PATH ) string(STRIP ${PYTHON_SYS_PATH} PYTHON_SYS_PATH) diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake index 989c4ea..91559f6 100644 --- a/cmake/FindPython.cmake +++ b/cmake/FindPython.cmake @@ -1,5 +1,7 @@ +find_package(Python3 REQUIRED COMPONENTS Interpreter) + execute_process( - COMMAND python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())" + COMMAND ${Python3_EXECUTABLE} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())" OUTPUT_VARIABLE PYTHON_SYS_PATH ) string(STRIP ${PYTHON_SYS_PATH} PYTHON_SYS_PATH) @@ -10,13 +12,13 @@ FIND_PATH(PYTHON_INCLUDE_PATH Python.h ) execute_process( - COMMAND python -c "from distutils.sysconfig import get_config_var; print(get_config_var('LIBDIR'))" + COMMAND ${Python3_EXECUTABLE} -c "from distutils.sysconfig import get_config_var; print(get_config_var('LIBDIR'))" OUTPUT_VARIABLE PYTHON_LIB_PATH ) string(STRIP ${PYTHON_LIB_PATH} PYTHON_LIB_PATH) execute_process( - COMMAND python -c "import sys; print('%s.%s' % sys.version_info[:2])" + COMMAND ${Python3_EXECUTABLE} -c "import sys; print('%s.%s' % sys.version_info[:2])" OUTPUT_VARIABLE PYTHON_VERSION ) string(STRIP ${PYTHON_VERSION} PYTHON_VERSION) @@ -29,7 +31,7 @@ FIND_LIBRARY(PYTHON_LIBRARY NAMES python${PYTHON_VERSION} ) execute_process( - COMMAND python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" + COMMAND ${Python3_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_PATH_tmp ) string(STRIP ${PYTHON_INSTALL_PATH_tmp} PYTHON_INSTALL_PATH_tmp) From 235262644ee80223720873592cf7efb4d2d1da5d Mon Sep 17 00:00:00 2001 From: Robert Cimrman Date: Sun, 23 Nov 2025 18:27:48 +0100 Subject: [PATCH 2/2] CI: update build_python action --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 071bc7d..01a3377 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,8 +122,6 @@ jobs: set -ex sudo apt-get update sudo apt-get install -y python3-numpy cython3 python3-pytest - sudo ln -s /usr/bin/cython3 /usr/bin/cython - sudo ln -s /usr/bin/pytest-3 /usr/bin/pytest - name: Build dftatom cmake python run: |