From ee63debb4fe2218ce67aaec573cd694166378116 Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 10:07:46 -0600 Subject: [PATCH 1/7] update multibuild pointer --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 452dd2d..88146e7 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 452dd2d1705f6b2375369a6570c415beb3163f70 +Subproject commit 88146e74ebc86baf97b6fec448ef766d64326582 From 4e62325df6232f0bf280e8f4af074a8b1a77f4b3 Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 10:11:35 -0600 Subject: [PATCH 2/7] add recursive clone for netcdf4-python --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 7fcf552..8867093 100644 --- a/config.sh +++ b/config.sh @@ -112,7 +112,7 @@ function build_netcdf { if [ -e netcdf-stamp ]; then return; fi #$fetch_unpack https://downloads.unidata.ucar.edu/netcdf-c/${NETCDF_VERSION}/netcdf-c-${NETCDF_VERSION}.tar.gz # this has fix for setting CURL path to find SSL certificates - git clone https://github.com/Unidata/netcdf-c netcdf-c-${NETCDF_VERSION} + git clone --recursive https://github.com/Unidata/netcdf-c netcdf-c-${NETCDF_VERSION} cd netcdf-c-${NETCDF_VERSION} git checkout 43b03a4da72dfaaa004adb1a288111c06eaa60ae autoreconf -i From ff15031f9a9265918439a59c5bb9a6dc4ef0ffbc Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 12:41:01 -0600 Subject: [PATCH 3/7] update tag --- .github/workflows/build-wheels-linux.yml | 8 ++++---- .github/workflows/build-wheels-macosx.yml | 4 ++-- .github/workflows/build-wheels-macosx2.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml index 88345a0..888f3d4 100644 --- a/.github/workflows/build-wheels-linux.yml +++ b/.github/workflows/build-wheels-linux.yml @@ -52,7 +52,7 @@ jobs: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python MB_ML_VER: 2014 - BUILD_COMMIT: v1.6.5rel + BUILD_COMMIT: v1.7.0rel UNICODE_WIDTH: 32 MB_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }} @@ -63,17 +63,17 @@ jobs: MULTIBUILD_WHEELS_STAGING_ACCESS: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Setup QEMU if: ${{ matrix.platform == 'aarch64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Setup Environment variables run: | diff --git a/.github/workflows/build-wheels-macosx.yml b/.github/workflows/build-wheels-macosx.yml index 29bb29e..6168916 100644 --- a/.github/workflows/build-wheels-macosx.yml +++ b/.github/workflows/build-wheels-macosx.yml @@ -31,7 +31,7 @@ jobs: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python MB_ML_VER: 2014 - BUILD_COMMIT: v1.6.5rel + BUILD_COMMIT: v1.7.0rel UNICODE_WIDTH: 32 PLAT: arm64 MB_PYTHON_VERSION: ${{ matrix.python-version }} @@ -48,7 +48,7 @@ jobs: with: submodules: recursive - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/build-wheels-macosx2.yml b/.github/workflows/build-wheels-macosx2.yml index 0b0e4e6..62e7ee8 100644 --- a/.github/workflows/build-wheels-macosx2.yml +++ b/.github/workflows/build-wheels-macosx2.yml @@ -31,7 +31,7 @@ jobs: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python MB_ML_VER: 2014 - BUILD_COMMIT: v1.6.5rel + BUILD_COMMIT: v1.7.0rel UNICODE_WIDTH: 32 PLAT: x86_64 MB_PYTHON_VERSION: ${{ matrix.python-version }} @@ -48,7 +48,7 @@ jobs: with: submodules: recursive - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} From bf63220e2de8ea349ba4b924594c83377f8ab9d8 Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 13:39:23 -0600 Subject: [PATCH 4/7] use macos-13 for x86_64, macos-lates for arm64 --- .github/workflows/build-wheels-macosx.yml | 6 +++--- .github/workflows/build-wheels-macosx2.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheels-macosx.yml b/.github/workflows/build-wheels-macosx.yml index 6168916..6d8625e 100644 --- a/.github/workflows/build-wheels-macosx.yml +++ b/.github/workflows/build-wheels-macosx.yml @@ -25,8 +25,8 @@ jobs: matrix: python-version: [ "3.9", "3.10", "3.11", "3.12" ] - os: [macos-latest] - platform: [x86_64] + os: "macos-latest" + platform: arm64 env: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python @@ -96,7 +96,7 @@ jobs: echo "------- BUILD WHEEL --------" build_wheel $REPO_DIR $PLAT echo "------- INSTALL_RUN --------" - #install_run $PLAT + install_run $PLAT - name: Upload wheels to release uses: svenstaro/upload-release-action@v2 if: github.event_name == 'create' diff --git a/.github/workflows/build-wheels-macosx2.yml b/.github/workflows/build-wheels-macosx2.yml index 62e7ee8..04bcd48 100644 --- a/.github/workflows/build-wheels-macosx2.yml +++ b/.github/workflows/build-wheels-macosx2.yml @@ -25,8 +25,8 @@ jobs: matrix: python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] - os: [macos-latest] - platform: [x86_64] + os: "macos-13" + platform: "x86_64" env: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python From ff6bf628f696a5239146848a23645ca170740f55 Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 13:42:47 -0600 Subject: [PATCH 5/7] update --- .github/workflows/build-wheels-macosx.yml | 6 +++--- .github/workflows/build-wheels-macosx2.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheels-macosx.yml b/.github/workflows/build-wheels-macosx.yml index 6d8625e..128e33e 100644 --- a/.github/workflows/build-wheels-macosx.yml +++ b/.github/workflows/build-wheels-macosx.yml @@ -1,7 +1,7 @@ # This workflow will install Python dependencies, run tests and build # manylinux wheels for a variety of python versions and architectures. -name: Build and upload cross-compiled arm64 macosx wheels +name: Build and upload arm64 macosx wheels on: push: @@ -25,8 +25,8 @@ jobs: matrix: python-version: [ "3.9", "3.10", "3.11", "3.12" ] - os: "macos-latest" - platform: arm64 + os: [macos-latest] + platform: [arm64] env: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python diff --git a/.github/workflows/build-wheels-macosx2.yml b/.github/workflows/build-wheels-macosx2.yml index 04bcd48..d0dd49c 100644 --- a/.github/workflows/build-wheels-macosx2.yml +++ b/.github/workflows/build-wheels-macosx2.yml @@ -25,8 +25,8 @@ jobs: matrix: python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] - os: "macos-13" - platform: "x86_64" + os: [macos-13] + platform: [x86_64] env: REPO_DIR: netcdf4-python PKG_NAME: netcdf4-python From 34fb599925fb60080c01409e65e58ad68247095e Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 14:19:50 -0600 Subject: [PATCH 6/7] don't try to build plugins --- config.sh | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/config.sh b/config.sh index 8867093..db9eb70 100644 --- a/config.sh +++ b/config.sh @@ -117,22 +117,22 @@ function build_netcdf { git checkout 43b03a4da72dfaaa004adb1a288111c06eaa60ae autoreconf -i cd .. - if [ -n "$IS_MACOS" ]; then - if [[ "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then - # no plugins installed - (cd netcdf-c-${NETCDF_VERSION} \ - && ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap \ - && make -j4 \ - && make install ) - else - # plugins installed - (cd netcdf-c-${NETCDF_VERSION} \ - && export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \ - && ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --with-plugin-dir=$HDF5_PLUGIN_PATH \ - && make -j4 \ - && make install ) - fi - else + #if [ -n "$IS_MACOS" ]; then + # if [[ "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then + # # no plugins installed + # (cd netcdf-c-${NETCDF_VERSION} \ + # && ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap \ + # && make -j4 \ + # && make install ) + # else + # # plugins installed + # (cd netcdf-c-${NETCDF_VERSION} \ + # && export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \ + # && ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --with-plugin-dir=$HDF5_PLUGIN_PATH \ + # && make -j4 \ + # && make install ) + # fi + #else (cd netcdf-c-${NETCDF_VERSION} \ && mkdir build \ && cd build \ @@ -151,7 +151,7 @@ function build_netcdf { # && make -j4 \ # && make install \ # && ls -l $HDF5_PLUGIN_PATH ) - fi + #fi touch netcdf-stamp } @@ -251,16 +251,16 @@ function build_blosc { function build_libs { echo "build_zlib" build_zlib - echo "build_lzo" - build_lzo - echo "build_lzf" - build_lzf - echo "build_zstd" - build_zstd - echo "build_bzip2" - build_bzip2 - echo "build_blosc" - build_blosc +# echo "build_lzo" +# build_lzo +# echo "build_lzf" +# build_lzf +# echo "build_zstd" +# build_zstd +# echo "build_bzip2" +# build_bzip2 +# echo "build_blosc" +# build_blosc echo "build_libaec" build_libaec echo "build_hdf5" From 09caf89d154048691c018e86ba7c043ff1b307dd Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 7 Jun 2024 14:50:53 -0600 Subject: [PATCH 7/7] don't set MACOSX_DEPLOYMENT_TARGET --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index db9eb70..9688dcc 100644 --- a/config.sh +++ b/config.sh @@ -11,7 +11,7 @@ export NO_CDL=1 export NO_PLUGINS=1 # Compile libs for macOS 10.9 or later -export MACOSX_DEPLOYMENT_TARGET="10.9" +#export MACOSX_DEPLOYMENT_TARGET="10.9" export NETCDF_VERSION="4.9.2" export HDF5_VERSION="1.12.2" export OPENSSL_ROOT=openssl-1.1.1t