Skip to content
Permalink
Browse files
Merge pull request #272 from apache/fix_wheels
Fix wheels
  • Loading branch information
jmalkin committed May 4, 2022
2 parents 1c745cb + e46a3ee commit f0f085c1bc03fd8d8df0ebb05794b7431695cea0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 31 deletions.
@@ -16,21 +16,18 @@ jobs:
name: Source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
persist-credentials: false
- uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v3
name: Install Python
with:
python-version: '3.8'
python-version: '3.x'

- name: Install Python dependencies
run: python -m pip install --upgrade pip setuptools wheel numpy tox pytest build
- name: Install build package
run: python -m pip install build --user

- name: Build sdist
run: python setup.py sdist
run: python -m build --sdist --outdir dist

- uses: actions/upload-artifact@v2
with:
@@ -44,42 +41,36 @@ jobs:
matrix:
config:
- {
name: "MacOS Latest, Clang",
os: macos-latest,
cc: "clang", cxx: "clang++"
name: "MacOS 10.15",
os: macos-latest
}
- {
name: "Ubuntu Latest, GCC",
os: ubuntu-latest,
cc: "gcc", cxx: "g++"
name: "Ubuntu Latest",
os: ubuntu-latest
}
- {
name: "Windows Latest, MSVC",
os: windows-latest,
cc: "cl", cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
name: "Windows Latest",
os: windows-latest
}

steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
persist-credentials: false
uses: actions/checkout@v3

- name: Set up Python 3.x
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: '3.x'

- name: Install Python dependencies
run: python -m pip install --upgrade pip setuptools wheel numpy tox pytest build cibuildwheel==2.1.1 twine
run: python -m pip install cibuildwheel==2.5.0

- name: Build wheels
run: python -m cibuildwheel --output-dir dist
env:
CIBW_SKIP: "*-win32"
CIBW_ARCHS_MACOS: "x86_64 universal2"
CIBW_BEFORE_BUILD: python -m pip install cmake>=3.18
CIBW_SKIP: "*-win32 pp*-macosx*"
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"

- uses: actions/upload-artifact@v2
with:
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.

cmake_minimum_required(VERSION 3.12.0)
cmake_minimum_required(VERSION 3.16.0)
project(DataSketches
VERSION 3.2.0
VERSION 3.4.0
LANGUAGES CXX)

include(GNUInstallDirs)
@@ -1,7 +1,7 @@
[build-system]
requires = ["wheel",
"setuptools >= 30.3.0",
"cmake >= 3.12",
"cmake >= 3.16",
"pip >= 10.0",
"pybind11[global] >= 2.6.0"]
build-backend = "setuptools.build_meta"
@@ -15,7 +15,11 @@
# specific language governing permissions and limitations
# under the License.

find_package(Python3 COMPONENTS Interpreter Development)
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)

0 comments on commit f0f085c

Please sign in to comment.