Add py310 testing

.gitlab-ci.yml

@@ -17,10 +17,10 @@ cache:
 .parallel: &parallel
   parallel:
     matrix:
-      - PY_VERSION: [38, 39]
+      - PY_VERSION: [38, 39, 310]
 
 variables:
-  PRIMARY_VERSION: 38
+  PRIMARY_VERSION: 39
   IMAGE_ROOT: containers.ligo.org/lscsoft/bilby_pipe/v3-bilby_pipe-python
   PRIMARY_IMAGE: $IMAGE_ROOT$PRIMARY_VERSION
 
@@ -234,7 +234,7 @@ build-container:
   image: docker:19.03.12
   needs: ["containers"]
   only:
-    - schedules
+  - schedules
   script:
     - cd containers
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

containers/v3-dockerfile-test-suite-python37 → containers/v3-dockerfile-test-suite-python310

 # This dockerfile is written automatically and should not be modified by hand.
 
-FROM containers.ligo.org/lscsoft/bilby/v2-bilby-python37
+FROM containers.ligo.org/lscsoft/bilby/v2-bilby-python310
 LABEL name="bilby_pipe CI testing" \
 maintainer="Gregory Ashton <gregory.ashton@ligo.org>"
 
-ENV conda_env python37
+ENV conda_env python310
 
 RUN echo "source activate ${conda_env}" > ~/.bashrc
 ENV PATH /opt/conda/envs/${conda_env}/bin:$PATH

containers/write_dockerfiles.py

@@ -3,7 +3,7 @@ from datetime import date
 with open("dockerfile-template", "r") as ff:
     template = ff.read()
 
-python_versions = [(3, 7), (3, 8), (3, 9)]
+python_versions = [(3, 8), (3, 9), (3, 10)]
 today = date.today().strftime("%Y%m%d")
 
 for python_major_version, python_minor_version in python_versions:

setup.py

@@ -49,7 +49,7 @@ setup(
     packages=[MAIN, JOB_CREATION, NODES],
     install_requires=[
         "future",
-        "pycondor>=0.5",
+        "pycondor>=0.6",
         "configargparse",
         "ligo-gracedb",
         "bilby[gw]>=1.1.5",
@@ -64,6 +64,7 @@ setup(
         "pesummary>=0.13.0",
         "jinja2",
         "astropy",
+        "python-ligo-lw>=1.8.0",
     ],
     python_requires=f">={minimum_py_major}.{minimum_py_minor}",
     entry_points={

tests/lalinference_test_injection_standard.json

@@ -49,4 +49,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file

tests/xml_converter_test.py

 import os
 import subprocess
+import sys
 import unittest
 
+import pytest
+
 import bilby_pipe.xml_converter
 
 
@@ -59,6 +62,9 @@ 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]