From 401db4fbddf0f7a23aec928d5147c78a14262c02 Mon Sep 17 00:00:00 2001 From: Zach Pearson Date: Thu, 6 Mar 2025 17:20:03 -0800 Subject: [PATCH] dev: Remove the Brewfile I don't think we need to install these anymore to build the pips --- .github/workflows/mac_arm_build.yml | 1 - .github/workflows/mac_intel_build.yml | 1 - utils/Brewfile | 10 ---------- utils/set_up_macos.sh | 2 -- 4 files changed, 14 deletions(-) diff --git a/.github/workflows/mac_arm_build.yml b/.github/workflows/mac_arm_build.yml index c0923b252b..94afd1a7fe 100644 --- a/.github/workflows/mac_arm_build.yml +++ b/.github/workflows/mac_arm_build.yml @@ -43,7 +43,6 @@ jobs: python3.10 -m pip install lief dmgbuild patch --ignore-whitespace -d /opt/homebrew/lib/python3.10/site-packages/dmgbuild -N -p0 < ./utils/build/macos/dmgbuild.patch - uses: actions/checkout@v4 - - run: ${PWD}/utils/set_up_macos.sh - name: Fetch Plato prerequisites uses: ./utils/ci/consolidated_cache with: diff --git a/.github/workflows/mac_intel_build.yml b/.github/workflows/mac_intel_build.yml index e031cbcb02..89ec7b7ec6 100644 --- a/.github/workflows/mac_intel_build.yml +++ b/.github/workflows/mac_intel_build.yml @@ -48,7 +48,6 @@ jobs: patch --ignore-whitespace -d /usr/local/lib/python3.10/site-packages/dmgbuild -N -p0 < ./utils/build/macos/dmgbuild.patch # Temporarily force this to succeed. The container's Python conflicts with homebrew's, # but we don't really use it anyway. - - run: ${PWD}/utils/set_up_macos.sh || true - name: Fetch Plato prerequisites uses: ./utils/ci/consolidated_cache with: diff --git a/utils/Brewfile b/utils/Brewfile index 2a3dd05840..623148e143 100644 --- a/utils/Brewfile +++ b/utils/Brewfile @@ -1,13 +1,3 @@ # vim: syntax=config: -brew "netcdf" -brew "hdf5" # tables -brew "lz4" # tables -brew "c-blosc" # tables brew "autoconf" brew "automake" -brew "libtool" -# if installing scipy from source -brew "openblas" -brew "jq" - -brew "python@3.10" diff --git a/utils/set_up_macos.sh b/utils/set_up_macos.sh index 3cb4fa8b19..76d87c8f5d 100755 --- a/utils/set_up_macos.sh +++ b/utils/set_up_macos.sh @@ -1,4 +1,2 @@ #/usr/bin/ev bash ROOT=$(dirname $(dirname -- $0)) - -brew bundle --file="$ROOT"/utils/Brewfile