From e9e852f0af43600241934783733440804218adc6 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 11:55:10 -0400
Subject: [PATCH 01/23] require pre-numpy 2.0

---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 03d9b5cfe22..01f1e7ee812 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ astropy>=2.0.3,!=4.2.1,!=4.0.5
 Mako>=1.0.1
 scipy>=0.16.0
 matplotlib>=2.0.0
-numpy>=1.16.0,!=1.19.0
+numpy>=1.16.0,!=1.19.0,numpy<2.0
 pillow
 h5py>=3.0.0,!=3.7.0
 jinja2
diff --git a/setup.py b/setup.py
index 20e979ba8e5..39e0da5f8d4 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
     'cython>=0.29',
-    'numpy>=1.16.0,!=1.19.0',
+    'numpy>=1.16.0,!=1.19.0,numpy<2.0'
     'scipy>=0.16.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
     'matplotlib>=1.5.1',

From fa02ae3046b2679101e91c26140423a10503427e Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 11:58:42 -0400
Subject: [PATCH 02/23] need to build against this for final release

---
 pyproject.toml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0810805586a..16b5920476b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,11 +2,7 @@
 requires = ["setuptools",
             "wheel",
             "cython>=0.29.21",
-            "numpy==1.16.0; python_version <= '3.7'",
-            "numpy==1.17.3; python_version == '3.8'",
-            "numpy==1.19.3; python_version == '3.9'",
-            "numpy==1.21.4; python_version =='3.10'",
-            "numpy; python_version >= '3.11'",
+            "oldest-supported-numpy",
             ]
 
 # To ensure the best compatibility, try to match the numpy reqs

From 81736e79f7c130120173243da10879d678ecaf88 Mon Sep 17 00:00:00 2001
From: Alex Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 12:01:28 -0400
Subject: [PATCH 03/23] Apply suggestions from code review

Co-authored-by: Tito Dal Canton <tito@dalcanton.it>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 39e0da5f8d4..cafc60c47a6 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
     'cython>=0.29',
-    'numpy>=1.16.0,!=1.19.0,numpy<2.0'
+    'numpy>=1.16.0,!=1.19.0,numpy<2.0',
     'scipy>=0.16.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
     'matplotlib>=1.5.1',

From 507b4e44516a008c3db1eaf93a6c4948e941418f Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 12:05:57 -0400
Subject: [PATCH 04/23] update version strings

---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 01f1e7ee812..a1a41e9b093 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ astropy>=2.0.3,!=4.2.1,!=4.0.5
 Mako>=1.0.1
 scipy>=0.16.0
 matplotlib>=2.0.0
-numpy>=1.16.0,!=1.19.0,numpy<2.0
+numpy>=1.16.0,!=1.19.0,numpy<2.0.0
 pillow
 h5py>=3.0.0,!=3.7.0
 jinja2
diff --git a/setup.py b/setup.py
index cafc60c47a6..ecc6f2f6c30 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
     'cython>=0.29',
-    'numpy>=1.16.0,!=1.19.0,numpy<2.0',
+    'numpy>=1.16.0,!=1.19.0,numpy<2.0.0',
     'scipy>=0.16.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
     'matplotlib>=1.5.1',

From 308cdc1c613c33f5be20d04d046f690bb4d473dc Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 12:09:35 -0400
Subject: [PATCH 05/23] update version strings

---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a1a41e9b093..25f99b30322 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ astropy>=2.0.3,!=4.2.1,!=4.0.5
 Mako>=1.0.1
 scipy>=0.16.0
 matplotlib>=2.0.0
-numpy>=1.16.0,!=1.19.0,numpy<2.0.0
+numpy>=1.16.0,!=1.19.0,<2.0.0
 pillow
 h5py>=3.0.0,!=3.7.0
 jinja2
diff --git a/setup.py b/setup.py
index ecc6f2f6c30..ccc65038fa0 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
     'cython>=0.29',
-    'numpy>=1.16.0,!=1.19.0,numpy<2.0.0',
+    'numpy>=1.16.0,!=1.19.0,<2.0.0',
     'scipy>=0.16.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
     'matplotlib>=1.5.1',

From a1f28d62680421b263aadcc2bfc12e0e38919077 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 12:41:32 -0400
Subject: [PATCH 06/23] update

---
 .github/workflows/distribution.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/distribution.yml b/.github/workflows/distribution.yml
index 183c2451604..122f01ae03d 100644
--- a/.github/workflows/distribution.yml
+++ b/.github/workflows/distribution.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.3.1
+        run: python -m pip install cibuildwheel
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         env:

From 2ca0b50c609a02e9d1b66cb583988cac35b2e9d0 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 12:50:47 -0400
Subject: [PATCH 07/23] try this

---
 pyproject.toml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 16b5920476b..9f6decd3ddf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,12 @@
 requires = ["setuptools",
             "wheel",
             "cython>=0.29.21",
-            "oldest-supported-numpy",
+            "numpy==1.16.0; python_version <= '3.7'",
+            "numpy==1.17.3; python_version == '3.8'",
+            "numpy==1.19.3; python_version == '3.9'",
+            "numpy==1.21.4; python_version =='3.10'",
+            "numpy==1.23.2; python_version=='3.11'",
+            "numpy; python_version >= '3.12'",
             ]
 
 # To ensure the best compatibility, try to match the numpy reqs

From b9bf690ede3e203d49fd2bbd378c38c138179d53 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 12:57:03 -0400
Subject: [PATCH 08/23] debug

---
 .github/workflows/basic-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index d962026e09a..9363d8defb5 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  #cancel-in-progress: true
 
 jobs:
   build:

From 2d09e0f149b3acd0c3bc552f796c7e4367416925 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 13:04:44 -0400
Subject: [PATCH 09/23] debug

---
 .github/workflows/basic-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 9363d8defb5..6febd7a7c0a 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -1,10 +1,10 @@
 name: basic tests
 
 on: [push, pull_request]
+if: always()
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  #cancel-in-progress: true
 
 jobs:
   build:

From 1cf81a01e2e02b90373b4b8a6ce2b092a97c4d15 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 13:14:16 -0400
Subject: [PATCH 10/23] test

---
 .github/workflows/basic-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 6febd7a7c0a..2f91e79fb5c 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -1,7 +1,6 @@
 name: basic tests
 
 on: [push, pull_request]
-if: always()
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

From 2264374c2da0ce2462023413135449fa2d30b510 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 13:22:29 -0400
Subject: [PATCH 11/23] hmmm.

---
 pyproject.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9f6decd3ddf..0810805586a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,8 +6,7 @@ requires = ["setuptools",
             "numpy==1.17.3; python_version == '3.8'",
             "numpy==1.19.3; python_version == '3.9'",
             "numpy==1.21.4; python_version =='3.10'",
-            "numpy==1.23.2; python_version=='3.11'",
-            "numpy; python_version >= '3.12'",
+            "numpy; python_version >= '3.11'",
             ]
 
 # To ensure the best compatibility, try to match the numpy reqs

From 4c0ffce5413b070077d697e5622917796de2df95 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 13:53:22 -0400
Subject: [PATCH 12/23] more debug

---
 .github/workflows/basic-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 2f91e79fb5c..1c98d839881 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -12,7 +13,7 @@ jobs:
       max-parallel: 60
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.8, 3.9, '3.10', '3.11']
+        python-version: [3.8, 3.9, '3.10']
         test-type: [unittest, search, docs]
     steps:
     - uses: actions/checkout@v3

From f8fd14aaa7700371759faf25508335bc9422088a Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 14:22:30 -0400
Subject: [PATCH 13/23] try this again?

---
 .github/workflows/basic-tests.yml | 2 +-
 pyproject.toml                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 1c98d839881..d962026e09a 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -13,7 +13,7 @@ jobs:
       max-parallel: 60
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.8, 3.9, '3.10']
+        python-version: [3.8, 3.9, '3.10', '3.11']
         test-type: [unittest, search, docs]
     steps:
     - uses: actions/checkout@v3
diff --git a/pyproject.toml b/pyproject.toml
index 0810805586a..1b3ca63a94a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,8 @@ requires = ["setuptools",
             "numpy==1.17.3; python_version == '3.8'",
             "numpy==1.19.3; python_version == '3.9'",
             "numpy==1.21.4; python_version =='3.10'",
-            "numpy; python_version >= '3.11'",
+            "numpy==1.23.4; python_version=='3.11'",
+            "numpy; python_version >= '3.12'",
             ]
 
 # To ensure the best compatibility, try to match the numpy reqs

From ecb753ebdf6c113f9b07031883e0cc6a8fb1f7b7 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Wed, 19 Jun 2024 14:32:06 -0400
Subject: [PATCH 14/23] update

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index ccc65038fa0..0ed406ff6f6 100755
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,10 @@ class cbuild_ext(_build_ext):
     def run(self):
         # At this point we can be sure pip has already installed numpy
         import numpy
+        import numpy.version
+        print("NUMPY VERSION!!!!!!!!!!!!", numpy.version.version)
+        print(numpy)
+        print(numpy.get_include())
         numpy_incl = numpy.get_include()
 
         for ext in self.extensions:

From 9bff085ac3a937ef8e73b5d373067941eb3032bd Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 12:14:29 -0400
Subject: [PATCH 15/23] no idea

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1b3ca63a94a..af1b3aa113d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 requires = ["setuptools",
             "wheel",
-            "cython>=0.29.21",
+            "cython>=3.0.0",
             "numpy==1.16.0; python_version <= '3.7'",
             "numpy==1.17.3; python_version == '3.8'",
             "numpy==1.19.3; python_version == '3.9'",

From d2b18698a4bfe8b26849ed6e7e0a22cb3e9ab0ab Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 12:23:47 -0400
Subject: [PATCH 16/23] maybe?

---
 .github/workflows/basic-tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index d962026e09a..5c3a2f9980e 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -55,6 +55,9 @@ jobs:
       with:
         name: documentation-page
         path: _gh-pages
+    - name: Setup tmate session
+      if: ${{ failure() }}
+      uses: mxschmitt/action-tmate@v3
   deploy_documentation:
     runs-on: ubuntu-latest
     needs: build

From 0cb8817424585b01ca61574ce2b789bc999f42f7 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 12:47:16 -0400
Subject: [PATCH 17/23] no external bash

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 4d0538c3968..3b4f8bc3d9c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ deps =
     mkl;'arm' not in platform_machine
 
 [testenv]
-allowlist_externals = bash
 passenv=LAL_DATA_PATH
 conda_deps=openssl=1.1
 conda_channels=conda-forge

From f066abb3952cbd1f4ba7cefaed028d12469cd45f Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 13:38:46 -0400
Subject: [PATCH 18/23] do this

---
 tox.ini | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 3b4f8bc3d9c..865aff1cfd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ deps =
     mkl;'arm' not in platform_machine
 
 [testenv]
+allowlist_externals = bash
 passenv=LAL_DATA_PATH
 conda_deps=openssl=1.1
 conda_channels=conda-forge
@@ -25,7 +26,6 @@ deps =
     pytest
     ; Needed for `BBHx` package to work with PyCBC
     git+https://github.com/mikekatz04/BBHx.git@4fff509; sys_platform == 'linux'
-    git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
 conda_deps=
     mysqlclient
     lin: gcc_linux-64>=12.2.0
@@ -36,7 +36,9 @@ conda_deps=
     gsl
     lapack==3.6.1
 conda_channels=conda-forge
-commands = pytest
+commands = 
+    pip install git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
+    pytest
 
 # The following are long running or may require
 # some extra system-level dependencies or static files.
@@ -66,7 +68,6 @@ deps =
     {[base]deps}
     ; Needed for `BBHx` package to work with PyCBC
     git+https://github.com/mikekatz04/BBHx.git@4fff509; sys_platform == 'linux'
-    git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
 conda_deps=
     mysqlclient
     lin: gcc_linux-64>=12.2.0
@@ -80,4 +81,6 @@ conda_deps=
     openmpi
 conda_channels=conda-forge
 setenv = PYCBC_TEST_TYPE=docs
-commands = bash tools/pycbc_test_suite.sh
+commands = 
+    pip install git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
+    bash tools/pycbc_test_suite.sh

From 0654a3db461c50ccd3eeedc427b6549bbe5c924b Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 13:50:20 -0400
Subject: [PATCH 19/23] update

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 865aff1cfd5..52a3f40e3a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ conda_deps=
     lapack==3.6.1
 conda_channels=conda-forge
 commands = 
-    pip install git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
+    pip install git+https://github.com/gwastro/BBHX-waveform-model.git
     pytest
 
 # The following are long running or may require
@@ -82,5 +82,5 @@ conda_deps=
 conda_channels=conda-forge
 setenv = PYCBC_TEST_TYPE=docs
 commands = 
-    pip install git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
+    pip install git+https://github.com/gwastro/BBHX-waveform-model.git
     bash tools/pycbc_test_suite.sh

From 8e2b679e277e047170e3053a5e158096554f521f Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 13:57:27 -0400
Subject: [PATCH 20/23] why not mac?

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 52a3f40e3a9..01913ea9caf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ deps =
     {[base]deps}
     pytest
     ; Needed for `BBHx` package to work with PyCBC
-    git+https://github.com/mikekatz04/BBHx.git@4fff509; sys_platform == 'linux'
+    git+https://github.com/mikekatz04/BBHx.git@4fff509
 conda_deps=
     mysqlclient
     lin: gcc_linux-64>=12.2.0
@@ -67,7 +67,7 @@ commands = bash tools/pycbc_test_suite.sh
 deps =
     {[base]deps}
     ; Needed for `BBHx` package to work with PyCBC
-    git+https://github.com/mikekatz04/BBHx.git@4fff509; sys_platform == 'linux'
+    git+https://github.com/mikekatz04/BBHx.git@4fff509
 conda_deps=
     mysqlclient
     lin: gcc_linux-64>=12.2.0

From cd48d7c8847e1689cd39251c537d575dfd112580 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 14:15:26 -0400
Subject: [PATCH 21/23] revert

---
 tox.ini | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index 01913ea9caf..4d0538c3968 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,8 @@ deps =
     {[base]deps}
     pytest
     ; Needed for `BBHx` package to work with PyCBC
-    git+https://github.com/mikekatz04/BBHx.git@4fff509
+    git+https://github.com/mikekatz04/BBHx.git@4fff509; sys_platform == 'linux'
+    git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
 conda_deps=
     mysqlclient
     lin: gcc_linux-64>=12.2.0
@@ -36,9 +37,7 @@ conda_deps=
     gsl
     lapack==3.6.1
 conda_channels=conda-forge
-commands = 
-    pip install git+https://github.com/gwastro/BBHX-waveform-model.git
-    pytest
+commands = pytest
 
 # The following are long running or may require
 # some extra system-level dependencies or static files.
@@ -67,7 +66,8 @@ commands = bash tools/pycbc_test_suite.sh
 deps =
     {[base]deps}
     ; Needed for `BBHx` package to work with PyCBC
-    git+https://github.com/mikekatz04/BBHx.git@4fff509
+    git+https://github.com/mikekatz04/BBHx.git@4fff509; sys_platform == 'linux'
+    git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
 conda_deps=
     mysqlclient
     lin: gcc_linux-64>=12.2.0
@@ -81,6 +81,4 @@ conda_deps=
     openmpi
 conda_channels=conda-forge
 setenv = PYCBC_TEST_TYPE=docs
-commands = 
-    pip install git+https://github.com/gwastro/BBHX-waveform-model.git
-    bash tools/pycbc_test_suite.sh
+commands = bash tools/pycbc_test_suite.sh

From a959b1fe778517bf34b333af530a1a06ba12dd83 Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 14:16:45 -0400
Subject: [PATCH 22/23] remove debug statement

---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index 0ed406ff6f6..ccc65038fa0 100755
--- a/setup.py
+++ b/setup.py
@@ -74,10 +74,6 @@ class cbuild_ext(_build_ext):
     def run(self):
         # At this point we can be sure pip has already installed numpy
         import numpy
-        import numpy.version
-        print("NUMPY VERSION!!!!!!!!!!!!", numpy.version.version)
-        print(numpy)
-        print(numpy.get_include())
         numpy_incl = numpy.get_include()
 
         for ext in self.extensions:

From e66b5e2481b5e59621a38b215d3d406834362dea Mon Sep 17 00:00:00 2001
From: Alexander Harvey Nitz <alex.nitz@gmail.com>
Date: Mon, 24 Jun 2024 14:38:56 -0400
Subject: [PATCH 23/23] remove tmate now

---
 .github/workflows/basic-tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 5c3a2f9980e..d962026e09a 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -55,9 +55,6 @@ jobs:
       with:
         name: documentation-page
         path: _gh-pages
-    - name: Setup tmate session
-      if: ${{ failure() }}
-      uses: mxschmitt/action-tmate@v3
   deploy_documentation:
     runs-on: ubuntu-latest
     needs: build