From 968bdb34e53bb50f524ac561be285412496ec53f Mon Sep 17 00:00:00 2001 From: lukashergt Date: Wed, 24 Apr 2024 12:38:56 -0700 Subject: [PATCH 1/6] attempt at fixing macOS CI by brew installing hdf5 --- .github/workflows/CI.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 01a690e1..2aad8c3b 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -72,6 +72,9 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Install hdf5 for macOS + if: ${{ matrix.os == 'macos-latest' }} + run: brew install hdf5 c-blosc - name: Install dependencies run: | @@ -110,6 +113,9 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: python-version: ${{ matrix.python-version }} + - name: Install hdf5 for macOS + if: ${{ matrix.os == 'macos-latest' }} + run: brew install hdf5 c-blosc - name: Install dependencies shell: bash -l {0} From 4d86084e828f576387f33ecbaebfec048348a669 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Wed, 24 Apr 2024 12:44:13 -0700 Subject: [PATCH 2/6] update from `miniconda@v2` to `miniconda@v3` --- .github/workflows/CI.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 2aad8c3b..a662ba6a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -110,7 +110,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} - name: Install hdf5 for macOS From a2a64d4e54677428a280169833a09c2c0c3d059b Mon Sep 17 00:00:00 2001 From: Will Handley Date: Wed, 24 Apr 2024 20:50:37 +0100 Subject: [PATCH 3/6] bump version to 2.8.11 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index e8fd0bc6..1c16e388 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.8.10 +:Version: 2.8.11 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 8728008c..9a2e0c8b 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.8.10' +__version__ = '2.8.11' From c9f912fdde85bbdfcc73b524bfa73f1b58a9c5f1 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Wed, 24 Apr 2024 13:00:46 -0700 Subject: [PATCH 4/6] try newer `tables` version, which was previously restricted to 3.8.0 in #379 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ff1d6db3..94caa394 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ astropy = ["astropy"] fastkde = ["fastkde"] getdist = ["getdist"] hdf5 = ["tables==3.8.0"] -all = ["h5py", "astropy", "fastkde", "getdist", "tables==3.8.0"] +all = ["h5py", "astropy", "fastkde", "getdist", "tables"] [project.scripts] anesthetic = "anesthetic.scripts:gui" From 204014ab3c10264a32ce2dfa37d239730c8249c5 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Wed, 24 Apr 2024 13:05:25 -0700 Subject: [PATCH 5/6] Revert "attempt at fixing macOS CI by brew installing hdf5" This reverts commit 968bdb34e53bb50f524ac561be285412496ec53f. --- .github/workflows/CI.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index a662ba6a..14e6534d 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -72,9 +72,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Install hdf5 for macOS - if: ${{ matrix.os == 'macos-latest' }} - run: brew install hdf5 c-blosc - name: Install dependencies run: | @@ -113,9 +110,6 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} - - name: Install hdf5 for macOS - if: ${{ matrix.os == 'macos-latest' }} - run: brew install hdf5 c-blosc - name: Install dependencies shell: bash -l {0} From bc59a032b61fd04f6165ac43c458facabc8e9643 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Wed, 24 Apr 2024 13:10:37 -0700 Subject: [PATCH 6/6] Reapply "attempt at fixing macOS CI by brew installing hdf5" This reverts commit 204014ab3c10264a32ce2dfa37d239730c8249c5. Seems like this is needed after all, otherwise macOS is struggling to find a local HDF5. --- .github/workflows/CI.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 14e6534d..a662ba6a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -72,6 +72,9 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Install hdf5 for macOS + if: ${{ matrix.os == 'macos-latest' }} + run: brew install hdf5 c-blosc - name: Install dependencies run: | @@ -110,6 +113,9 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} + - name: Install hdf5 for macOS + if: ${{ matrix.os == 'macos-latest' }} + run: brew install hdf5 c-blosc - name: Install dependencies shell: bash -l {0}