Changes for v2.3.8

.github/workflows/basic-tests.yml

@@ -16,9 +16,9 @@ jobs:
         python-version: [3.8, 3.9, '3.10', '3.11']
         test-type: [unittest, search, docs]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: installing system packages
@@ -51,7 +51,7 @@ jobs:
         tox -e py-inference
     - name: store documentation page
       if: matrix.test-type == 'docs' && matrix.python-version == '3.8'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: documentation-page
         path: _gh-pages
@@ -61,7 +61,7 @@ jobs:
     if: github.ref == 'refs/heads/master' && github.event_name == 'push'
     steps:
     - name: retrieve built documentation
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4.1.7
       with:
         name: documentation-page
     - name: debug

.github/workflows/build_venv.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v1
       -
         name: "Set up Python"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       -

.github/workflows/distribution.yml

@@ -15,10 +15,10 @@ jobs:
         os: [ubuntu-20.04, macos-12]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Install cibuildwheel
@@ -29,29 +29,33 @@ jobs:
           CIBW_BUILD: cp38-* cp39-* cp310-* cp311-*
           CIBW_SKIP: "*musllinux*"
           CIBW_ARCHS_MACOS: x86_64 arm64
-      - uses: actions/upload-artifact@v2
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
         with:
+          name: wheel-${{ matrix.os }}
           path: ./wheelhouse/*.whl
   deploy_pypi:
-    name: Build and publish Python 🐍 distributions 📦 to PyPI
+    name: Package and publish to PyPI
     runs-on: ubuntu-20.04
     needs: build_wheels
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4.1.7
       with:
-        path: ./
-    - name: build pycbc for pypi
+        pattern: wheel-*
+        merge-multiple: true
+        path: dist/
+    - name: Build source distribution
       run: |
         python setup.py sdist
-        mv artifact/* dist/
-    - name: Publish distribution 📦 to PyPI
+        ls -lh dist
+    - name: Publish to PyPI
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@master
       with:

.github/workflows/docker-build.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v1
       -
         name: "Set up Python"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       -

.github/workflows/inference-workflow.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: install condor
@@ -48,12 +48,12 @@ jobs:
         find submitdir/work/ -type f -name '*.tar.gz' -delete
     - name: store log files
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: logs
         path: gw_output/submitdir/work
     - name: store result page
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: results
         path: html

.github/workflows/mac-test.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - run: |

.github/workflows/search-workflow.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: install condor
@@ -55,12 +55,12 @@ jobs:
         find submitdir/work/ -type f -name '*.tar.gz' -delete
     - name: store log files
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: logs
         path: output/submitdir/work
     - name: store result page
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: results
         path: html

.github/workflows/tmpltbank-workflow.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: install condor
@@ -51,7 +51,7 @@ jobs:
         find submitdir/work/ -type f -name '*.tar.gz' -delete
     - name: store log files
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: logs
         path: output/submitdir/work

.github/workflows/tut-test.yml

@@ -15,9 +15,9 @@ jobs:
         os: [ubuntu-20.04]
         python-version: [3.8, 3.9, '3.10', '3.11']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: installing packages

.github/workflows/workflow-tests.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: install condor
@@ -50,7 +50,7 @@ jobs:
         find submitdir/work/ -type f -name '*.tar.gz' -delete
     - name: store log files
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: logs-${{matrix.test-type}}
         path: examples/workflow/generic/${{matrix.test-type}}/submitdir/work

bin/pycbc_source_probability_offline

@@ -25,20 +25,13 @@ parser.add_argument('--search-tag', required=True,
 parser.add_argument('--ifar-threshold', type=float, default=None,
                     help='Select only candidate events with IFAR '
                          'above threshold.')
-parser.add_argument('--include-mass-gap', action='store_true',
-                    help='Option to include the Mass Gap region.')
 parser.add_argument('--verbose', action='count')
 parser.add_argument("--version", action="version",
                     version=pycbc.version.git_verbose_msg)
 mchirp_area.insert_args(parser)
 args = parser.parse_args()
 
-mc_area_args = mchirp_area.from_cli(args)
-
-if not args.include_mass_gap:
-    mass_bdary = mc_area_args['mass_bdary']
-    assert mass_bdary['ns_max'] == mass_bdary['gap_max'], \
-           'NS/Mass Gap boundaries should be the same.'
+mc_area_args = mchirp_area.from_cli(args, parser)
 
 pycbc.init_logging(args.verbose)
 
@@ -88,7 +81,8 @@ for event in tqdm.trange(len(ifar)):
                        / sngl_snr[ifo][0][event] for ifo in ifos_event])
     probs = mchirp_area.calc_probabilities(mchirp[event], coinc_snr,
                                            min_eff_dist, mc_area_args)
-    if not args.include_mass_gap:
+    # We do not expect a mass gap entry, but just in case
+    if "Mass Gap" in probs:
         probs.pop("Mass Gap")
     ifo_names = ''.join(sorted(ifos_event))
     out_name = dir_path + '%s-%s-%i-1.json' % (ifo_names, args.search_tag,

companion.txt

@@ -6,7 +6,7 @@ healpy
 
 # Needed for GraceDB uploads and skymap generation
 ligo-gracedb>=2.10.0
-ligo.skymap!=1.1.0
+ligo.skymap!=1.1.0,<2.0.0
 
 # auxiliary samplers
 epsie>=1.0

setup.py

@@ -119,7 +119,7 @@ def __getattr__(self, attr):
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '2.3.7'
+        vinfo.version = '2.3.8'
         vinfo.release = 'True'
 
     version_script = f"""# coding: utf-8