From f48cc6e62b95c64ae3e624c2f89b28ea8aa0eee6 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 13:40:07 +0100 Subject: [PATCH 1/9] use mamba for ci --- .github/workflows/tests.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7dae365..18c848b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,17 +22,31 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + - name: Configure environment with Python ${{ matrix.python-version}} + uses: mamba-org/setup-micromamba@v1 with: - python-version: ${{ matrix.python-version }} - cache: 'pip' + micromamba-version: '1.5.8-0' + environment-name: bbhx-test + create-args: >- + python=${{ matrix.python-version }} + gcc_linux-64 + gxx_linux-64 + gsl + lapack + numpy + scipy + Cython + ipython + matplotlib + pytest + pycbc + cache-environment: true + post-cleanup: 'all' - name: Install dependencies run: | python -m pip install --upgrade pip pip install git+https://github.com/mikekatz04/BBHx.git@dd4c1f5b5a180ca10e699bd0317238be7480f28b pip install . - pip install pytest - name: Test with pytest run: | python -m pytest -v tests.py From ca7a9fdc4d0d6b8f90df1dc9cee49f8ff3a8014a Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 13:42:12 +0100 Subject: [PATCH 2/9] remove micromamba version --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 18c848b..75211f4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,6 @@ jobs: - name: Configure environment with Python ${{ matrix.python-version}} uses: mamba-org/setup-micromamba@v1 with: - micromamba-version: '1.5.8-0' environment-name: bbhx-test create-args: >- python=${{ matrix.python-version }} From c525c98f3dd6fadcc83ccbbdba79db0f50c5ebe9 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 13:47:56 +0100 Subject: [PATCH 3/9] rename to tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 75211f4..fa6e16d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - unittests: + tests: name: Tests - Python ${{ matrix.python-version }} strategy: From ad16e563b51d45d5d6f0225aaa5e3ee1a72fcea4 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 13:51:32 +0100 Subject: [PATCH 4/9] trigger CI From 7a9490afe533e4bd4b1f2cfe6412d0cf0266907e Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 13:56:19 +0100 Subject: [PATCH 5/9] fix typo in CI env --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fa6e16d..9e8d224 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: lapack numpy scipy - Cython + cython ipython matplotlib pytest From 3ffc37da9a9ed53dd06ce4027e3029fc20f420f0 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 14:07:00 +0100 Subject: [PATCH 6/9] specify shell --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9e8d224..9689d67 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,6 +39,7 @@ jobs: matplotlib pytest pycbc + pip cache-environment: true post-cleanup: 'all' - name: Install dependencies @@ -46,6 +47,8 @@ jobs: python -m pip install --upgrade pip pip install git+https://github.com/mikekatz04/BBHx.git@dd4c1f5b5a180ca10e699bd0317238be7480f28b pip install . + shell: micromamba-shell {0} - name: Test with pytest run: | python -m pytest -v tests.py + shell: micromamba-shell {0} From 5a4193e184aef156d845c1257e657e9fed217f91 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 14:13:30 +0100 Subject: [PATCH 7/9] pin lapack version --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9689d67..71f73c0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: gcc_linux-64 gxx_linux-64 gsl - lapack + lapack=3.6.1 numpy scipy cython From b89236fea5f158f960ea60319df174ea9369b2b9 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 14:19:49 +0100 Subject: [PATCH 8/9] add pycbc master --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 71f73c0..673445e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: gcc_linux-64 gxx_linux-64 gsl - lapack=3.6.1 + lapack=3.6.1 # CI fails if this is not pinned numpy scipy cython @@ -45,6 +45,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + # Need current master branch of pycbc + pip install git+https://github.com/gwastro/pycbc.git + # Need older version of BBHx pip install git+https://github.com/mikekatz04/BBHx.git@dd4c1f5b5a180ca10e699bd0317238be7480f28b pip install . shell: micromamba-shell {0} From fa426a00bb1245dcb7859df9f11876e60cb12573 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 May 2024 14:22:08 +0100 Subject: [PATCH 9/9] remove comment --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 673445e..6a3d983 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: gcc_linux-64 gxx_linux-64 gsl - lapack=3.6.1 # CI fails if this is not pinned + lapack=3.6.1 numpy scipy cython