From b3f2d351ed2dbb2bbb6e117c220cc73f4e0fe0d1 Mon Sep 17 00:00:00 2001 From: Gareth S Cabourn Davies Date: Wed, 31 Jul 2024 14:39:53 +0100 Subject: [PATCH] Set back to development (#4833) * Update setup.py * Update tox.ini * Revert "Update tox.ini" This reverts commit 7cbe4dc1199e7d5202c2aaa675b4034e0c080e64. * try this * Revert "try this" This reverts commit c6fd4a7b53d98ba92ca212eb2b4ad3729f95e0cb. * pip install cython and numpy before tox runs * Revert "pip install cython and numpy before tox runs" This reverts commit 67702f30e819b2e382780b453cbe6ad4505fb29f. * Ian's suggestion * try me * Try just not installing BBHx until I work out how to fix this * Turn off lisa examples in teh docs building * Do not try to include image whihc is not longer made --- docs/_include/inference_example_lisa_smbhb_inj.sh | 8 ++++---- docs/_include/inference_example_lisa_smbhb_ldc.sh | 6 +++--- docs/inference/examples/lisa_smbhb_inj_pe.rst | 5 ++++- docs/inference/examples/lisa_smbhb_ldc_pe.rst | 5 ++++- setup.py | 4 ++-- tox.ini | 8 ++++---- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/docs/_include/inference_example_lisa_smbhb_inj.sh b/docs/_include/inference_example_lisa_smbhb_inj.sh index d5ae715389b..a0515de3bf8 100644 --- a/docs/_include/inference_example_lisa_smbhb_inj.sh +++ b/docs/_include/inference_example_lisa_smbhb_inj.sh @@ -1,6 +1,6 @@ set -e export OMP_NUM_THREADS=1 -cp ../../examples/inference/lisa_smbhb_inj/injection_smbhb.ini injection_smbhb.ini -sh ../../examples/inference/lisa_smbhb_inj/injection_smbhb.sh -sh ../../examples/inference/lisa_smbhb_inj/run.sh -sh ../../examples/inference/lisa_smbhb_inj/plot.sh +#cp ../../examples/inference/lisa_smbhb_inj/injection_smbhb.ini injection_smbhb.ini +#sh ../../examples/inference/lisa_smbhb_inj/injection_smbhb.sh +#sh ../../examples/inference/lisa_smbhb_inj/run.sh +#sh ../../examples/inference/lisa_smbhb_inj/plot.sh diff --git a/docs/_include/inference_example_lisa_smbhb_ldc.sh b/docs/_include/inference_example_lisa_smbhb_ldc.sh index 29f3a6c8e8b..b83a01c6560 100644 --- a/docs/_include/inference_example_lisa_smbhb_ldc.sh +++ b/docs/_include/inference_example_lisa_smbhb_ldc.sh @@ -1,5 +1,5 @@ set -e export OMP_NUM_THREADS=1 -sh ../../examples/inference/lisa_smbhb_ldc/get.sh -sh ../../examples/inference/lisa_smbhb_ldc/run.sh -python ../../examples/inference/lisa_smbhb_ldc/advanced_plot.py +#sh ../../examples/inference/lisa_smbhb_ldc/get.sh +#sh ../../examples/inference/lisa_smbhb_ldc/run.sh +#python ../../examples/inference/lisa_smbhb_ldc/advanced_plot.py diff --git a/docs/inference/examples/lisa_smbhb_inj_pe.rst b/docs/inference/examples/lisa_smbhb_inj_pe.rst index 7924261c8f9..c74d7b6bfe2 100644 --- a/docs/inference/examples/lisa_smbhb_inj_pe.rst +++ b/docs/inference/examples/lisa_smbhb_inj_pe.rst @@ -57,7 +57,10 @@ To plot the posterior distribution after the last iteration, you can run the fol In this example it will create the following plot: -.. image:: ../../_include/lisa_smbhb_mass_tc.png +.. warning:: + EXAMPLE TURNED OFF FOR NOW +.. + image:: ../../_include/lisa_smbhb_mass_tc.png :scale: 60 :align: center diff --git a/docs/inference/examples/lisa_smbhb_ldc_pe.rst b/docs/inference/examples/lisa_smbhb_ldc_pe.rst index 0e49929d0bc..fbb57f8f134 100644 --- a/docs/inference/examples/lisa_smbhb_ldc_pe.rst +++ b/docs/inference/examples/lisa_smbhb_ldc_pe.rst @@ -61,7 +61,10 @@ Or you can run the advanced one: You can modify this advanced plot script to generate the posterior of any SMBHB signals in the LDC Sangria dataset. In this example it will create the following plot: -.. image:: ../../_include/lisa_smbhb_mass_tc_0.png +.. warning:: + EXAMPLE TURNED OFF FOR NOW +.. + image:: ../../_include/lisa_smbhb_mass_tc_0.png :scale: 60 :align: center diff --git a/setup.py b/setup.py index 66474334e32..33bd8044209 100755 --- 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 index ee0d9866c71..601958256b3 100644 --- a/tox.ini +++ b/tox.ini @@ -26,8 +26,8 @@ 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/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' + ; 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 @@ -67,8 +67,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; sys_platform == 'linux' - git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' + ; 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