PyCBC 2.3.12__tar.gz → 2.3.13__tar.gz

{PyCBC-2.3.12 → PyCBC-2.3.13}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PyCBC
-Version: 2.3.12
+Version: 2.3.13
 Summary: Core library to analyze gravitational-wave data, find signals, and study their parameters.
 Home-page: http://www.pycbc.org/
 Author: The PyCBC team
 Author-email: alex.nitz@gmail.org
 License: UNKNOWN
-Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.12
+Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.13
 Description: ![GW150914](https://raw.githubusercontent.com/gwastro/pycbc-logo/master/pycbc_logo_name.png)
         
         [PyCBC](http://pycbc.org) is a software package used to explore astrophysical sources of gravitational waves.

{PyCBC-2.3.12 → PyCBC-2.3.13}/PyCBC.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PyCBC
-Version: 2.3.12
+Version: 2.3.13
 Summary: Core library to analyze gravitational-wave data, find signals, and study their parameters.
 Home-page: http://www.pycbc.org/
 Author: The PyCBC team
 Author-email: alex.nitz@gmail.org
 License: UNKNOWN
-Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.12
+Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.13
 Description: ![GW150914](https://raw.githubusercontent.com/gwastro/pycbc-logo/master/pycbc_logo_name.png)
         
         [PyCBC](http://pycbc.org) is a software package used to explore astrophysical sources of gravitational waves.

{PyCBC-2.3.12 → PyCBC-2.3.13}/PyCBC.egg-info/requires.txt

@@ -1,5 +1,5 @@
 numpy>=1.16.0
-cython>=0.29
+cython<3.1.0,>=0.29
 numpy!=1.19.0,<2.0.0,>=1.16.0
 scipy<1.14.0,>=0.16.0
 astropy!=4.0.5,!=4.2.1,>=2.0.3

{PyCBC-2.3.12 → PyCBC-2.3.13}/pycbc/results/scatter_histograms.py

@@ -383,6 +383,7 @@ def create_marginalized_hist(ax, values, label, percentiles=None,
     """
     if fillcolor is None:
         htype = 'step'
+        fillcolor = 'none'
     else:
         htype = 'stepfilled'
     if rotated:

{PyCBC-2.3.12 → PyCBC-2.3.13}/pycbc/results/versioning.py

@@ -90,9 +90,11 @@ def get_library_version_info():
 
     pycbcinfo = {}
     pycbcinfo['Name'] = 'PyCBC'
-    pycbcinfo['ID'] = pycbc.version.version
+    pycbcinfo['ID'] = pycbc.version.git_hash
     pycbcinfo['Status'] = pycbc.version.git_status
-    pycbcinfo['Version'] = pycbc.version.release or ''
+    pycbcinfo['Version'] = pycbc.version.version
+    if pycbc.version.release:
+        pycbcinfo['Version'] += ' (release)'
     pycbcinfo['Tag'] = pycbc.version.git_tag
     pycbcinfo['Author'] = pycbc.version.git_author
     pycbcinfo['Builder'] = pycbc.version.git_builder

PyCBC-2.3.13/pycbc/version.py

@@ -0,0 +1,27 @@
+# coding: utf-8
+# Generated by setup.py for PyCBC on 2025-05-12 13:46:03 +0000.
+
+# general info
+version = '2.3.13'
+date = '2025-05-12 13:24:39 +0000'
+release = True
+last_release = '2.8.2'
+
+# git info
+git_hash = 'f1208f1ff4ace3e0c67b8b68923e0fa9cb256abd'
+git_branch = 'None'
+git_tag = 'v2.3.13'
+git_author = 'Ian Harry <ian.harry@ligo.org>'
+git_committer = 'GitHub <noreply@github.com>'
+git_status = 'CLEAN: All modifications committed'
+git_builder = 'Unknown User <>'
+git_build_date = '2025-05-12 13:46:03 +0000'
+git_verbose_msg = """Version: 2.3.13
+Branch: None
+Tag: v2.3.13
+Id: f1208f1ff4ace3e0c67b8b68923e0fa9cb256abd
+Builder: Unknown User <>
+Build date: 2025-05-12 13:46:03 +0000
+Repository status is CLEAN: All modifications committed"""
+
+from pycbc._version import *

{PyCBC-2.3.12 → PyCBC-2.3.13}/pycbc/workflow/configuration.py

@@ -27,6 +27,7 @@ workflow construction. This module is described in the page here:
 https://ldas-jobs.ligo.caltech.edu/~cbc/docs/pycbc/ahope/initialization_inifile.html
 """
 
+import re
 import os
 import logging
 import stat
@@ -34,7 +35,6 @@ import shutil
 import subprocess
 from shutil import which
 import urllib.parse
-from urllib.parse import urlparse
 
 from pycbc.types.config import InterpolatingConfigParser
 
@@ -45,6 +45,69 @@ urllib.parse.uses_relative.append('osdf')
 urllib.parse.uses_netloc.append('osdf')
 
 
+def resolve_url_http(url, u, filename):
+    """Helper function used by `resolve_url()` to handle HTTP and HTTPS URLs.
+    """
+
+    # Would like to move ciecplib import to top using import_optional, but
+    # it needs to be available when documentation runs in the CI, and I
+    # can't get it to install in the GitHub CI
+    import ciecplib
+
+    headers = None
+
+    if u.netloc == 'git.ligo.org':
+        # We need to do two ugly special things to download a file from
+        # git.ligo.org. First, we need to pass a per-user GitLab Personal Access
+        # Token via the headers. Second, we need to translate the raw-download
+        # URL scheme to a different scheme that uses GitLab's REST API.
+        re_match = re.match(
+            'https://git.ligo.org/([^ ]+(?<!/-))/(?:-/)?raw/([^ /]+)/(.+)', url
+        )
+        assert re_match, f'Failed to parse URL {url} for git.ligo.org special case'
+        project = re_match.group(1)
+        ref = re_match.group(2)
+        file_path = re_match.group(3)
+        logging.info(
+            'Special-case download from git.ligo.org: '
+            'file %s from ref %s of project %s',
+            file_path,
+            ref,
+            project
+        )
+        project = urllib.parse.quote(project, safe='')
+        ref = urllib.parse.quote(ref, safe='')
+        # GitLab's REST API does not seem to like double slashes
+        file_path = os.path.normpath(file_path)
+        file_path = urllib.parse.quote(file_path, safe='')
+        # FIXME This code will break once GitLab changes their mind about the
+        # URL format. As a different approach, we could rely on the gitlab
+        # Python module to (arguably) make this more robust. For now I prefer
+        # to avoid adding one more dependency, and stick with ciecplib.
+        url = f'https://git.ligo.org/api/v4/projects/{project}/repository/files/{file_path}/raw?ref={ref}'
+        # Get the user's Personal Access Token and pass it as a header
+        xdg_config_home = (
+            os.environ.get('XDG_CONFIG_HOME') or os.path.expanduser('~/.config')
+        )
+        with open(f'{xdg_config_home}/pycbc/git-ligo-org.pat', 'rb') as pat_fh:
+            headers = {
+                'PRIVATE-TOKEN': pat_fh.read().decode('ascii').strip()
+            }
+
+    # Make the scitokens logger a little quieter
+    # (it is called through ciecpclib)
+    curr_level = logging.getLogger().level
+    logging.getLogger('scitokens').setLevel(curr_level + 10)
+
+    with ciecplib.Session() as s:
+        r = s.get(url, allow_redirects=True, headers=headers)
+        r.raise_for_status()
+    content = r.content
+
+    with open(filename, "wb") as output_fp:
+        output_fp.write(r.content)
+
+
 def resolve_url(url, directory=None, permissions=None, copy_to_cwd=True):
     """Resolves a URL to a local file, and returns the path to that file.
 
@@ -54,7 +117,7 @@ def resolve_url(url, directory=None, permissions=None, copy_to_cwd=True):
     (the default).
     """
 
-    u = urlparse(url)
+    u = urllib.parse.urlparse(url)
 
     # determine whether the file exists locally
     islocal = u.scheme == "" or u.scheme == "file"
@@ -83,24 +146,8 @@ def resolve_url(url, directory=None, permissions=None, copy_to_cwd=True):
             else:
                 shutil.copy(u.path, filename)
 
-    elif u.scheme == "http" or u.scheme == "https":
-        # Would like to move ciecplib import to top using import_optional, but
-        # it needs to be available when documentation runs in the CI, and I
-        # can't get it to install in the GitHub CI
-        import ciecplib
-        # Make the scitokens logger a little quieter
-        # (it is called through ciecpclib)
-        logging.getLogger('scitokens').setLevel(logging.root.level + 10)
-        with ciecplib.Session() as s:
-            if u.netloc in ("git.ligo.org", "code.pycbc.phy.syr.edu"):
-                # authenticate with git.ligo.org using callback
-                s.get("https://git.ligo.org/users/auth/shibboleth/callback")
-            r = s.get(url, allow_redirects=True)
-            r.raise_for_status()
-
-        output_fp = open(filename, "wb")
-        output_fp.write(r.content)
-        output_fp.close()
+    elif u.scheme in ("http", "https"):
+        resolve_url_http(url, u, filename)
 
     elif u.scheme == "osdf":
         # OSDF will require a scitoken to be present and stashcp to be

{PyCBC-2.3.12 → PyCBC-2.3.13}/pycbc/workflow/pegasus_sites.py

@@ -23,7 +23,8 @@ from Pegasus.api import Arch, OS, SiteCatalog
 
 from pycbc.version import last_release, version, release  # noqa
 
-if release == 'True':
+
+if release:
     sing_version = version
 else:
     sing_version = last_release

{PyCBC-2.3.12 → PyCBC-2.3.13}/pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = ["setuptools",
             "wheel",
-            "cython>=3.0.0",
+            "cython>=3.0.0,<3.1.0",
             "numpy==1.16.0; python_version <= '3.7'",
             "numpy==1.17.3; python_version == '3.8'",
             "numpy==1.19.3; python_version == '3.9'",

{PyCBC-2.3.12 → PyCBC-2.3.13}/setup.py

@@ -33,7 +33,7 @@ from setuptools import find_packages
 requires = []
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
-    'cython>=0.29',
+    'cython>=0.29,<3.1.0',
     'numpy>=1.16.0,!=1.19.0,<2.0.0',
     'scipy>=0.16.0,<1.14.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
@@ -119,8 +119,8 @@ def get_version_info():
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '2.3.12'
-        vinfo.release = 'True'
+        vinfo.version = '2.3.13'
+        vinfo.release = True
 
     version_script = f"""# coding: utf-8
 # Generated by setup.py for PyCBC on {vinfo.build_date}.
@@ -128,7 +128,7 @@ def get_version_info():
 # general info
 version = '{vinfo.version}'
 date = '{vinfo.date}'
-release = '{vinfo.release}'
+release = {vinfo.release}
 last_release = '{vinfo.last_release}'
 
 # git info

PyCBC-2.3.12/pycbc/version.py

@@ -1,27 +0,0 @@
-# coding: utf-8
-# Generated by setup.py for PyCBC on 2025-03-13 16:51:02 +0000.
-
-# general info
-version = '2.3.12'
-date = '2025-03-13 16:28:30 +0000'
-release = 'True'
-last_release = '2.7.3'
-
-# git info
-git_hash = '538dc192be6acbdf9faa55156a911da1730dc18b'
-git_branch = 'None'
-git_tag = 'v2.3.12'
-git_author = 'Ian Harry <ian.harry@ligo.org>'
-git_committer = 'GitHub <noreply@github.com>'
-git_status = 'CLEAN: All modifications committed'
-git_builder = 'Unknown User <>'
-git_build_date = '2025-03-13 16:51:02 +0000'
-git_verbose_msg = """Version: 2.3.12
-Branch: None
-Tag: v2.3.12
-Id: 538dc192be6acbdf9faa55156a911da1730dc18b
-Builder: Unknown User <>
-Build date: 2025-03-13 16:51:02 +0000
-Repository status is CLEAN: All modifications committed"""
-
-from pycbc._version import *