TESTING

.github/workflows/basic-tests.yml

@@ -13,7 +13,7 @@ jobs:
  max-parallel: 60
  matrix:
  os: [ubuntu-20.04]
- python-version: [3.8, 3.9, '3.10', '3.11']
+ python-version: ['3.10', '3.11']
  test-type: [unittest, search, docs]
  steps:
  - uses: actions/checkout@v3

.github/workflows/distribution.yml

@@ -20,13 +20,13 @@ jobs:
  fetch-depth: 0
  - uses: actions/setup-python@v4
  with:
- python-version: 3.8
+ python-version: '3.10'
  - name: Install cibuildwheel
- run: python -m pip install cibuildwheel==2.3.1
+ run: python -m pip install cibuildwheel==2.17.0
  - name: Build wheels
  run: python -m cibuildwheel --output-dir wheelhouse
  env:
- CIBW_BUILD: cp38-* cp39-* cp310-* cp311-*
+ CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
  CIBW_SKIP: "*musllinux*"
  CIBW_ARCHS_MACOS: x86_64 arm64
  - uses: actions/upload-artifact@v2
@@ -40,10 +40,10 @@ jobs:
  - uses: actions/checkout@v3
  with:
  fetch-depth: 0
- - name: Set up Python 3.8
+ - name: Set up Python 3.10
  uses: actions/setup-python@v4
  with:
- python-version: 3.8
+ python-version: '3.10'
  - uses: actions/download-artifact@v2
  with:
  path: ./

.github/workflows/inference-workflow.yml

@@ -10,7 +10,7 @@ jobs:
  - name: Set up Python
  uses: actions/setup-python@v4
  with:
- python-version: 3.8
+ python-version: '3.10'
  - name: install condor
  run: |
  wget -qO - https://research.cs.wisc.edu/htcondor/ubuntu/HTCondor-Release.gpg.key | sudo apt-key add -

.github/workflows/mac-test.yml

@@ -13,7 +13,7 @@ jobs:
  max-parallel: 4
  matrix:
  os: [macos-12]
- python-version: [3.8, 3.9, '3.10', '3.11']
+ python-version: ['3.10', '3.11', '3.12']
  steps:
  - uses: actions/checkout@v1
  - name: Set up Python ${{ matrix.python-version }}
@@ -25,5 +25,4 @@ jobs:
  pip install --upgrade pip setuptools "tox<4.0.0"
  - name: run basic pycbc test suite
  run: |
- sudo chmod -R 777 /usr/local/miniconda/
  tox -e py-unittest

.github/workflows/search-workflow.yml

@@ -15,7 +15,7 @@ jobs:
  - name: Set up Python
  uses: actions/setup-python@v4
  with:
- python-version: 3.8
+ python-version: '3.10'
  - name: install condor
  run: |
  wget -qO - https://research.cs.wisc.edu/htcondor/ubuntu/HTCondor-Release.gpg.key | sudo apt-key add -

.github/workflows/tmpltbank-workflow.yml

@@ -14,7 +14,7 @@ jobs:
  - name: Set up Python
  uses: actions/setup-python@v4
  with:
- python-version: 3.8
+ python-version: '3.10'
  - name: install condor
  run: |
  wget -qO - https://research.cs.wisc.edu/htcondor/ubuntu/HTCondor-Release.gpg.key | sudo apt-key add -

.github/workflows/tut-test.yml

@@ -13,7 +13,7 @@ jobs:
  max-parallel: 60
  matrix:
  os: [ubuntu-20.04]
- python-version: [3.8, 3.9, '3.10', '3.11']
+ python-version: ['3.10', '3.11', '3.12']
  steps:
  - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}

.github/workflows/workflow-tests.yml

@@ -19,7 +19,7 @@ jobs:
  - name: Set up Python
  uses: actions/setup-python@v4
  with:
- python-version: 3.8
+ python-version: '3.10'
  - name: install condor
  run: |
  wget -qO - https://research.cs.wisc.edu/htcondor/ubuntu/HTCondor-Release.gpg.key | sudo apt-key add -

bin/all_sky_search/pycbc_cut_merge_triggers_to_tmpltbank

@@ -21,13 +21,25 @@ Reduce a MERGE triggers file to a reduced template bank
 """
 
 import logging
-import imp
 import argparse
 import numpy
 import h5py
 import pycbc
 import pycbc.version
 
+import importlib.util
+import importlib.machinery
+
+def load_source(modname, filename):
+ loader = importlib.machinery.SourceFileLoader(modname, filename)
+ spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+ module = importlib.util.module_from_spec(spec)
+ # The module is always executed and not cached in sys.modules.
+ # Uncomment the following line to cache the module.
+ # sys.modules[module.__name__] = module
+ loader.exec_module(module)
+ return module
+
 parser = argparse.ArgumentParser(description=__doc__)
 pycbc.add_common_pycbc_options(parser)
 parser.add_argument("--version", action="version",
@@ -52,7 +64,7 @@ pycbc.init_logging(opt.verbose)
 
 bank_fd = h5py.File(opt.full_template_bank, 'r')
 
-modl = imp.load_source('filter_func', opt.filter_func_file)
+modl = load_source('filter_func', opt.filter_func_file)
 func = modl.filter_tmpltbank
 bool_arr = func(bank_fd)
 

bin/all_sky_search/pycbc_reduce_template_bank

@@ -23,12 +23,24 @@ Reduce a template bank using some input parameter cuts
 
 import numpy
 import logging
-import imp
 import argparse
 import h5py
 import pycbc
 import pycbc.version
 
+import importlib.util
+import importlib.machinery
+
+def load_source(modname, filename):
+ loader = importlib.machinery.SourceFileLoader(modname, filename)
+ spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+ module = importlib.util.module_from_spec(spec)
+ # The module is always executed and not cached in sys.modules.
+ # Uncomment the following line to cache the module.
+ # sys.modules[module.__name__] = module
+ loader.exec_module(module)
+ return module
+
 parser = argparse.ArgumentParser(description=__doc__)
 pycbc.add_common_pycbc_options(parser)
 parser.add_argument("--version", action="version",
@@ -51,7 +63,7 @@ pycbc.init_logging(opt.verbose)
 
 bank_fd = h5py.File(opt.input_bank, 'r')
 
-modl = imp.load_source('filter_func', opt.filter_func_file)
+modl = load_source('filter_func', opt.filter_func_file)
 func = modl.filter_tmpltbank
 bool_arr = func(bank_fd)
 

bin/pycbc_banksim_match_combine

@@ -22,7 +22,6 @@ a set of injection files. The *order* of the injection files *must* match the
 bank files, and the number of injections in each must correspond one-to-one.
 """
 
-import imp
 import argparse
 import numpy as np
 import h5py
@@ -34,6 +33,18 @@ from pycbc import pnutils
 from pycbc.waveform import TemplateBank
 from pycbc.io.ligolw import LIGOLWContentHandler
 
+import importlib.util
+import importlib.machinery
+
+def load_source(modname, filename):
+ loader = importlib.machinery.SourceFileLoader(modname, filename)
+ spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+ module = importlib.util.module_from_spec(spec)
+ # The module is always executed and not cached in sys.modules.
+ # Uncomment the following line to cache the module.
+ # sys.modules[module.__name__] = module
+ loader.exec_module(module)
+ return module
 
 __author__ = "Ian Harry <ian.harry@astro.cf.ac.uk>"
 __version__ = pycbc.version.git_verbose_msg
@@ -138,7 +149,7 @@ for val in trig_par_list:
  f['trig_params/{}'.format(val)] = trig_params[val]
 
 if options.filter_func_file:
- modl = imp.load_source('filter_func', options.filter_func_file)
+ modl = load_source('filter_func', options.filter_func_file)
  func = modl.filter_injections
  bool_arr = func(inj_params['mass1'], inj_params['mass2'],
  inj_params['spin1z'], inj_params['spin2z'])

pyproject.toml

@@ -2,14 +2,5 @@
 requires = ["setuptools",
  "wheel",
  "cython>=0.29.21",
- "numpy==1.16.0; python_version <= '3.7'",
- "numpy==1.17.3; python_version == '3.8'",
- "numpy==1.19.3; python_version == '3.9'",
- "numpy==1.21.4; python_version =='3.10'",
- "numpy; python_version >= '3.11'",
+ "numpy<2.0",
  ]
-
-# To ensure the best compatibility, try to match the numpy reqs
-# where possible to the following used by scipy and the minimum
-# of our normal numpy requirements in setup.py
-# https://github.com/scipy/oldest-supported-numpy/blob/master/setup.cfg

requirements.txt

@@ -3,7 +3,7 @@ astropy>=2.0.3,!=4.2.1,!=4.0.5
 Mako>=1.0.1
 scipy>=0.16.0
 matplotlib>=2.0.0
-numpy>=1.16.0,!=1.19.0
+numpy<2.0
 pillow
 h5py>=3.0.0,!=3.7.0
 jinja2