You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by jm...@apache.org on 2022/05/04 21:41:16 UTC
[datasketches-cpp] branch fix_wheels updated: restore wheel matrix, remove verbosity, condition find_package(Python3) on cmake version to address issue
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a commit to branch fix_wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-cpp.git
The following commit(s) were added to refs/heads/fix_wheels by this push:
new a1fb186 restore wheel matrix, remove verbosity, condition find_package(Python3) on cmake version to address issue
a1fb186 is described below
commit a1fb186e75d4545b4bb3de2623c19acccece57f8
Author: Jon Malkin <jm...@users.noreply.github.com>
AuthorDate: Wed May 4 14:41:08 2022 -0700
restore wheel matrix, remove verbosity, condition find_package(Python3) on cmake version to address issue
---
.github/workflows/build_wheels.yml | 19 +++++++++----------
python/CMakeLists.txt | 15 +++++----------
setup.py | 4 +---
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index fceb356..8a8ad9d 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -40,18 +40,18 @@ jobs:
fail-fast: false
matrix:
config:
- #- {
- # name: "MacOS 10.15",
- # os: macos-latest
- # }
+ - {
+ name: "MacOS 10.15",
+ os: macos-latest
+ }
- {
name: "Ubuntu Latest",
os: ubuntu-latest
}
- #- {
- # name: "Windows Latest",
- # os: windows-latest
- # }
+ - {
+ name: "Windows Latest",
+ os: windows-latest
+ }
steps:
- name: Checkout
@@ -69,8 +69,7 @@ jobs:
run: python -m cibuildwheel --output-dir dist
env:
CIBW_BEFORE_BUILD: python -m pip install cmake>=3.18
- CIBW_BUILD_VERBOSITY: 3
- CIBW_SKIP: "*-win32 pp*-macosx* muslinux* *i686"
+ CIBW_SKIP: "*-win32 pp*-macosx*"
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
- uses: actions/upload-artifact@v2
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 2ff9c9f..d28c1fa 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -15,13 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-message("CMAKE_VERSION: " ${CMAKE_VERSION})
-message("Python_EXECUTABLE: " ${Python_EXECUTABLE})
-message("Python_ROOT_DIR: " ${Python_ROOT_DIR})
-
-find_package(Python3 COMPONENTS Interpreter Development)
-
-message("Python version: " ${Python_VERSION})
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.18.0")
+find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
+else()
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+endif()
# only Windows+MSVC seems to have trouble locating pybind11
if (MSVC)
@@ -33,9 +31,6 @@ if (MSVC)
endif()
find_package(pybind11 CONFIG REQUIRED)
-message("PYBIND11_PYTHON_VERSION: " ${PYBIND11_PYTHON_VERSION})
-message("pybind11_INCLUDE_DIR: " ${pybind11_INCLUDE_DIR})
-message("pybind11_INCLUDE_DIRS: " ${pybind11_INCLUDE_DIRS})
pybind11_add_module(python MODULE EXCLUDE_FROM_ALL THIN_LTO)
diff --git a/setup.py b/setup.py
index 7fd4f3a..87727db 100644
--- a/setup.py
+++ b/setup.py
@@ -51,9 +51,7 @@ class CMakeBuild(build_ext):
cmake_args += ['-DWITH_PYTHON=True']
cmake_args += ['-DCMAKE_CXX_STANDARD=11']
# ensure we use a consistent python version
- cmake_args += ['-DPython_EXECUTABLE=' + sys.executable]
- cmake_args += ['-DPython_ROOT_DIR=' + os.path.dirname(sys.executable)]
- cmake_args += ['--trace-expand']
+ cmake_args += ['-DPython3_EXECUTABLE=' + sys.executable]
cfg = 'Debug' if self.debug else 'Release'
build_args = ['--config', cfg]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org