From 4174d179ff238d6e2e482ca8ee4d44f14f026171 Mon Sep 17 00:00:00 2001 From: Gregory Ashton Date: Thu, 18 Aug 2022 15:12:22 +0100 Subject: [PATCH 1/4] Reinstate python 3.10 xml tests --- tests/xml_converter_test.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/xml_converter_test.py b/tests/xml_converter_test.py index 9b56a3d..56e138b 100644 --- a/tests/xml_converter_test.py +++ b/tests/xml_converter_test.py @@ -1,10 +1,7 @@ import os import subprocess -import sys import unittest -import pytest - import bilby_pipe.xml_converter @@ -62,9 +59,6 @@ class TestInput(unittest.TestCase): ) self.assertTrue(os.path.isfile(self.test_xml_file.replace("xml", "dat"))) - @pytest.mark.skipif( - sys.version_info >= (3, 10), reason="XML package broken in python3.10 or higher" - ) def test_conversion(self): df = bilby_pipe.xml_converter.xml_to_dataframe(self.test_xml_file, 20) row = df.iloc[0] -- GitLab From a18c4e4a9f2a9cd8a47d301c618ec8c5a72097cf Mon Sep 17 00:00:00 2001 From: Gregory Ashton Date: Tue, 4 Oct 2022 15:40:20 +0100 Subject: [PATCH 2/4] Enforce gwpy version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4b6140a..1ca8ddf 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ setup( "ligo-gracedb", "bilby[gw]>=1.2.1", "scipy>=1.2.0", - "gwpy", + "gwpy>=3.0", "gwosc", "matplotlib", "numpy", -- GitLab From 17e4264d978e9630dff767f70f6c8508f69d9034 Mon Sep 17 00:00:00 2001 From: Gregory Ashton Date: Fri, 7 Oct 2022 08:13:07 +0100 Subject: [PATCH 3/4] Remove erroneous dtype kwarg --- bilby_pipe/data_generation.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bilby_pipe/data_generation.py b/bilby_pipe/data_generation.py index 678b903..b3b2cbb 100644 --- a/bilby_pipe/data_generation.py +++ b/bilby_pipe/data_generation.py @@ -893,9 +893,7 @@ class DataGenerationInput(Input): logger.info(f"Setting source={source}") if "gwf" in format_ext: - kwargs = dict( - source=source, channel=channel, dtype=dtype, format="gwf.lalframe" - ) + kwargs = dict(source=source, channel=channel, format="gwf.lalframe") type_kwargs = dict(dtype=dtype, subok=True, copy=False) elif "hdf5" in format_ext: kwargs = dict(source=source, start=start_time, end=end_time, format="hdf5") -- GitLab From 44346a781d4e400e2b9d2f90ba9e111319639299 Mon Sep 17 00:00:00 2001 From: Gregory Ashton Date: Fri, 7 Oct 2022 08:39:01 +0100 Subject: [PATCH 4/4] Update version of injection file --- .../lalinference_test_injection_standard.xml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/lalinference_test_injection_standard.xml b/tests/lalinference_test_injection_standard.xml index 6eec871..d4a1afc 100644 --- a/tests/lalinference_test_injection_standard.xml +++ b/tests/lalinference_test_injection_standard.xml @@ -15,43 +15,43 @@ - + - "inspinj","6fbd011790c6140bacaaaa1e73cfc181fae20788","CLEAN: All modifications committed",1235341073," ",0,"ldas-pcdev5","5251",1111890,1235451588,1235451588,0,"lalapps","","process:process_id:0" + "inspinj","6fbd011790c6140bacaaaa1e73cfc181fae20788","CLEAN: All modifications committed",1235341073," ",0,"ldas-pcdev5","5251",1111890,1235451588,1235451588,0,"lalapps","",0 - + - "inspinj","process:process_id:0","--f-lower","float","20.000000", - "inspinj","process:process_id:0","--disable-spin","string","", - "inspinj","process:process_id:0","--waveform","string","IMRPhenomPv2pseudoFourPN", - "inspinj","process:process_id:0","--amp-order","int","0", - "inspinj","process:process_id:0","--gps-start-time","int","441417609", - "inspinj","process:process_id:0","--gps-end-time","int","441417619", - "inspinj","process:process_id:0","--l-distr","string","random", - "inspinj","process:process_id:0","--m-distr","string","fixMasses", - "inspinj","process:process_id:0","--fixed-mass1","float","30.000000", - "inspinj","process:process_id:0","--fixed-mass2","float","30.000000", - "inspinj","process:process_id:0","--i-distr","string","uniform", - "inspinj","process:process_id:0","--snr-distr","string","uniform", - "inspinj","process:process_id:0","--min-snr","float","2.000000e+01", - "inspinj","process:process_id:0","--max-snr","float","2.000000e+01", - "inspinj","process:process_id:0","--ifos","string","H1,L1,V1", - "inspinj","process:process_id:0","--ligo-fake-psd","string","LALAdLIGO", - "inspinj","process:process_id:0","--virgo-fake-psd","string","LALAdVirgo", - "inspinj","process:process_id:0","--ligo-start-freq","float","20.000000", - "inspinj","process:process_id:0","--virgo-start-freq","float","20.000000", - "inspinj","process:process_id:0","--time-step","float","1.000000e+01", - "inspinj","process:process_id:0","--output","string","injection.xml" + "inspinj",0,"--f-lower","float","20.000000", + "inspinj",0,"--disable-spin","string","", + "inspinj",0,"--waveform","string","IMRPhenomPv2pseudoFourPN", + "inspinj",0,"--amp-order","int","0", + "inspinj",0,"--gps-start-time","int","441417609", + "inspinj",0,"--gps-end-time","int","441417619", + "inspinj",0,"--l-distr","string","random", + "inspinj",0,"--m-distr","string","fixMasses", + "inspinj",0,"--fixed-mass1","float","30.000000", + "inspinj",0,"--fixed-mass2","float","30.000000", + "inspinj",0,"--i-distr","string","uniform", + "inspinj",0,"--snr-distr","string","uniform", + "inspinj",0,"--min-snr","float","2.000000e+01", + "inspinj",0,"--max-snr","float","2.000000e+01", + "inspinj",0,"--ifos","string","H1,L1,V1", + "inspinj",0,"--ligo-fake-psd","string","LALAdLIGO", + "inspinj",0,"--virgo-fake-psd","string","LALAdVirgo", + "inspinj",0,"--ligo-start-freq","float","20.000000", + "inspinj",0,"--virgo-start-freq","float","20.000000", + "inspinj",0,"--time-step","float","1.000000e+01", + "inspinj",0,"--output","string","injection.xml"
- + @@ -108,9 +108,9 @@ - + - "process:process_id:0","IMRPhenomPv2pseudoFourPN",441417609,0,441417608,991722360,441417608,984393628,441417609,3492055,441417609,15302287,441417609,3291874,-1.3802405557688196e+04,"",3.000000e+01,3.000000e+01,2.611652e+01,2.500000e-01,1.196095e+03,3.373201e-01,-1.979138e-01,2.189086e+00,1.548461e-01,4.598893e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,2.000000e+01,0.000000e+00,3.280378e+03,2.361955e+03,4.760892e+03,2.616181e+03,6.229851e+03,0,0,"",0,"TAPER_NONE",0,"sim_inspiral:simulation_id:0" + 0,"IMRPhenomPv2pseudoFourPN",441417609,0,441417608,991722360,441417608,984393628,441417609,3492055,441417609,15302287,441417609,3291874,-1.3802405557688196e+04,"",3.000000e+01,3.000000e+01,2.611652e+01,2.500000e-01,1.196095e+03,3.373201e-01,-1.979138e-01,2.189086e+00,1.548461e-01,4.598893e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,0.000000e+00,2.000000e+01,0.000000e+00,3.280378e+03,2.361955e+03,4.760892e+03,2.616181e+03,6.229851e+03,0,0,"",0,"TAPER_NONE",0,0
-- GitLab