From d13101360d92915345ba2cf399b7ecbd026b0bfa Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 00:57:42 +0000 Subject: [PATCH 1/9] build: remove cross-compilation overrides for macos-arm --- pyproject.toml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 580d2de..846a6ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,17 +45,6 @@ build-verbosity = "3" archs = ["x86_64", "arm64"] environment = { CC = "clang", CXX = "clang++", FC = "gfortran-11" } -[[tool.cibuildwheel.overrides]] -select = "*-macosx_arm64" -before-build = "bash {project}/tools/wheels/cibw_before_build_macos.sh {project}" - -# Override the default environment variables with the cross-compiled ones -[tool.cibuildwheel.overrides.environment] -CC = "clang" -CXX = "clang++" -FC = "/opt/gfortran-darwin-arm64-cross/bin/arm64-apple-darwin20.0.0-gfortran" -LDFLAGS = "-L/opt/gfortran-darwin-arm64-cross/lib/gcc/arm64-apple-darwin20.0.0/11.3.0 -Wl,-rpath,/opt/gfortran-darwin-arm64-cross/lib/gcc/arm64-apple-darwin20.0.0/11.3.0" - [tool.cibuildwheel.windows] archs = ["auto64"] environment = { CC = "gcc", CXX = "g++", FC = "gfortran" } From f344312be182c0e005951579fd36a44a9d2c14bf Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:00:30 +0000 Subject: [PATCH 2/9] build: use GFortran-12 for macos This is the lowest version in macos; both x86 and arm --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 846a6ce..13e7cf1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ build-verbosity = "3" [tool.cibuildwheel.macos] archs = ["x86_64", "arm64"] -environment = { CC = "clang", CXX = "clang++", FC = "gfortran-11" } +environment = { CC = "clang", CXX = "clang++", FC = "gfortran-12" } [tool.cibuildwheel.windows] archs = ["auto64"] From 557d60eb6fc1a4e330da47f87dff3b9cea638805 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:01:23 +0000 Subject: [PATCH 3/9] ci: switch MacOs runner to macos-13 --- .github/workflows/wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 640eac5..add34d0 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -12,7 +12,7 @@ jobs: sys: - { os: windows-2019, shell: "msys2 {0}" } - { os: ubuntu-20.04, shell: bash } - - { os: macos-11, shell: bash } + - { os: macos-13, shell: bash } defaults: run: shell: ${{ matrix.sys.shell }} From 2c1680e160722b9e60e0f60f2ef6ccf36e86cde7 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:02:30 +0000 Subject: [PATCH 4/9] ci: add MacOS native ARM runner --- .github/workflows/wheel.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index add34d0..9f48f25 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -13,6 +13,7 @@ jobs: - { os: windows-2019, shell: "msys2 {0}" } - { os: ubuntu-20.04, shell: bash } - { os: macos-13, shell: bash } + - { os: macos-14, shell: bash } defaults: run: shell: ${{ matrix.sys.shell }} From 4211d6e55f46d56b5ef226da6ba719074251d9b6 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:03:03 +0000 Subject: [PATCH 5/9] ci: bump Python to 3.12 --- .github/workflows/wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 9f48f25..0825652 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - if: runner.os == 'Windows' uses: msys2/setup-msys2@v2 From d1db3e36dac27c8ce76d7c8c0d0934b2cf187db5 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:09:42 +0000 Subject: [PATCH 6/9] f --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 13e7cf1..b43fbde 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ bug-tracker = "https://github.com/fortran-lang/fpm/issues" write_to = "src/fpm/_version.py" [tool.cibuildwheel] -build = "cp310-*" +build = "cp312-*" build-verbosity = "3" [tool.cibuildwheel.macos] From 2a0ade83aac92e3c96ed13b07b1c55a63165f6b7 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:20:05 +0000 Subject: [PATCH 7/9] build: verbosity as an int --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b43fbde..ac44ff1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ write_to = "src/fpm/_version.py" [tool.cibuildwheel] build = "cp312-*" -build-verbosity = "3" +build-verbosity = 3 [tool.cibuildwheel.macos] archs = ["x86_64", "arm64"] From 462a349b741a6bb0c2672a5026b7ef8f568fbad3 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:20:21 +0000 Subject: [PATCH 8/9] build: remove cmake hack --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc4da37..de260bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,12 +111,6 @@ add_executable(${BIN_NAME} ${SRC_FILES} ${fpm_src_SOURCE_DIR}/app/main.f90) # version preproc tag was added in fpm 0.8.2 target_compile_definitions(${BIN_NAME} PRIVATE FPM_RELEASE_VERSION=${FPM_VERSION}) -# HACK: circumvent compiler's default preprocessor heuristic and enable it -# globally. This is to circumvent sr/fpm/fpm_release.f90 erroneous lowecase -# file extension. -# Remove in the next fpm release -target_compile_options(${BIN_NAME} PRIVATE "-cpp") - if(OpenMP_Fortran_FOUND) message(STATUS "OpenMP Fortran found: Building fpm for parallel execution") target_link_libraries(${BIN_NAME} PUBLIC OpenMP::OpenMP_Fortran) From f0ee44f9db2a7269050fa977bf44dfaee347dda0 Mon Sep 17 00:00:00 2001 From: gnikit Date: Thu, 20 Mar 2025 01:23:03 +0000 Subject: [PATCH 9/9] build: bump setuptools --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ac44ff1..a2dd622 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools>=67.0.0", + "setuptools>=75.0.0", "scikit-build>=0.16.7", "cmake>=3.20.0", "ninja",