Merge branch 'gwastro:master' into accelerate_multiband

gwastro · Jul 31, 2024 · 87f10cb · 87f10cb
2 parents 02b6937 + 63c0ecf
commit 87f10cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -95,8 +95,8 @@ def __getattr__(self, attr):
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '2.5.0'
-        vinfo.release = 'True'
+        vinfo.version = '2.5.dev1'
+        vinfo.release = 'False'
 
     version_script = f"""# coding: utf-8
 # Generated by setup.py for PyCBC on {vinfo.build_date}.

diff --git a/tox.ini b/tox.ini
@@ -26,7 +26,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/titodalcanton/BBHx.git@py39-and-cleanup; sys_platform == 'linux'
     git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
 conda_deps=
     mysqlclient
@@ -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/titodalcanton/BBHx.git@py39-and-cleanup; sys_platform == 'linux'
     git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux'
 conda_deps=
     mysqlclient