Skip to content

Commit

Permalink
Set back to development (#4833)
Browse files Browse the repository at this point in the history
* Update setup.py

* Update tox.ini

* Revert "Update tox.ini"

This reverts commit 7cbe4dc.

* try this

* Revert "try this"

This reverts commit c6fd4a7.

* pip install cython and numpy before tox runs

* Revert "pip install cython and numpy before tox runs"

This reverts commit 67702f3.

* 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
  • Loading branch information
GarethCabournDavies authored Jul 31, 2024
1 parent e32b429 commit b3f2d35
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
8 changes: 4 additions & 4 deletions docs/_include/inference_example_lisa_smbhb_inj.sh
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions docs/_include/inference_example_lisa_smbhb_ldc.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion docs/inference/examples/lisa_smbhb_inj_pe.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion docs/inference/examples/lisa_smbhb_ldc_pe.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b3f2d35

Please sign in to comment.