diff --git a/bilby_pipe/data_generation.py b/bilby_pipe/data_generation.py
index 678b90312d7c76b9d0fe5bac97e49c62e09a9c73..b3b2cbb00d26a5e3a4bc1f125646e3254bb44b55 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")
diff --git a/setup.py b/setup.py
index 4b6140a26505a11fde4966484a1aae44d6177a8f..1ca8ddf4e28842001f3daeb0a5cea617297579ca 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",
diff --git a/tests/lalinference_test_injection_standard.xml b/tests/lalinference_test_injection_standard.xml
index 6eec871f60a8c59edc3ff9b15e80c4a0ad9b96b3..d4a1afc832e4b1190f0d61174c4df99c72470cee 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
diff --git a/tests/xml_converter_test.py b/tests/xml_converter_test.py
index 9b56a3df12a6c76a9cd0649aeebbc48da91b50a7..56e138bc562e0f5919c991a54801f6d99a58e9ea 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]