Skip to content

Commit

Permalink
removed universal2
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Papior <[email protected]>
  • Loading branch information
zerothi committed Sep 19, 2023
1 parent 6a99e88 commit 81b8f36
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,16 @@ jobs:

# Setup the fortran compiler. This is aware of the operating system.
- uses: awvwgk/setup-fortran@main
if: runner.os != 'Windows'
id: sf
with:
compiler: gcc
version: 11

- uses: msys2/setup-msys2@v2
if: runner.os == 'Windows'

# We use the cibuildwheel action to take care of everything
- name: Build wheels
uses: pypa/[email protected]
env:
#SKBUILD_CMAKE_ARGS: -DCMAKE_Fortran_COMPILER=${{ steps.sf.outputs.fc }};-DCMAKE_C_COMPILER=${{ steps.sf.outputs.cc }}
SKBUILD_CMAKE_ARGS: -DCMAKE_Fortran_COMPILER=${{ steps.sf.outputs.fc }};-DCMAKE_C_COMPILER=${{ steps.sf.outputs.cc }}
CC: ${{ steps.setup-fortran.outputs.cc }}
FC: ${{ steps.setup-fortran.outputs.fc }}

Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,16 @@ message(STATUS "Compilation flags")
list(APPEND CMAKE_MESSAGE_INDENT " ")

set(CFLAGS $ENV{CFLAGS})
cmake_print_variables(CMAKE_C_COMPILER)
cmake_print_variables(CFLAGS)
cmake_print_variables(CMAKE_C_FLAGS)
set(CXXFLAGS $ENV{CXXFLAGS})
cmake_print_variables(CMAKE_CXX_COMPILER)
cmake_print_variables(CXXFLAGS)
cmake_print_variables(CMAKE_CXX_FLAGS)
if(WITH_FORTRAN)
set(FFLAGS $ENV{FFLAGS})
cmake_print_variables(CMAKE_Fortran_COMPILER)
cmake_print_variables(FFLAGS)
cmake_print_variables(CMAKE_Fortran_FLAGS)
endif()
Expand Down
16 changes: 12 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,22 @@ skip = [
test-command = "bash {project}/tools/build_tools/test_wheel.sh {project}"

[tool.cibuildwheel.linux]
archs = ["x86_64", "aarch64"]

archs = [
"x86_64",
"aarch64",
]

[tool.cibuildwheel.windows]
archs = ["AMD64", "x86"]
archs = [
"AMD64",
"x86",
]

test-command = "pytest --pyargs sisl -m 'not slow'"

[tool.cibuildwheel.macos]
archs = ["x86_64", "universal2"]
archs = [
"x86_64",
# "universal2",
]
test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"

0 comments on commit 81b8f36

Please sign in to comment.