sxs 2025.0.18__tar.gz → 2025.0.20__tar.gz

{sxs-2025.0.18 → sxs-2025.0.20}/.github/workflows/build.yml

@@ -31,14 +31,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ['3.10', '3.13']
-        exclude:
-          - os: windows-latest
-            python-version: '3.13'
-          - os: macos-latest
-            python-version: '3.13'
-        include:
-          - os: macos-latest
-            python-version: '3.12'
 
     steps:
       - name: Skip replicates unless on main branch or using ubuntu-latest
@@ -52,7 +44,7 @@ jobs:
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
         uses: actions/cache@v4
         with:
-          key: sxs-${{ runner.os }}-3 # Increment this number whenever the cached files should change
+          key: sxs-${{ runner.os }}-4 # Increment this number whenever the cached files should change
           path: |
             ${{ runner.os == 'Linux' && '/home/runner/.cache/sxs' || runner.os == 'Windows' && 'C:\Users\runneradmin\.sxs\cache' || '/Users/runner/.sxs/cache' }}
 
@@ -68,17 +60,14 @@ jobs:
 
       - name: Check out code
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python ${{ matrix.python-version }} with uv
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
-        uses: actions/setup-python@v5
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Install Hatch
-        if: ${{ env.skipping_build_and_test_replicate != 'true' }}
-        run: python -m pip install --disable-pip-version-check --upgrade hatch
+          enable-cache: true
 
       - name: Run tests
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
@@ -86,7 +75,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          hatch run test --durations=0
+          uv run --with hatch hatch run python -c 'import ssl; print("openssl: ", ssl.OPENSSL_VERSION_INFO)'
+          # Run the tests, but skip Julia installation on windows because these runners come with openssl 1!!!
+          uv run --with hatch hatch run test --durations=0 ${{ runner.os == 'Windows' && '--ignore=tests/test_julia.py' || '' }}
 
       - name: Upload coverage
         if: "matrix.python-version == '3.13' && matrix.os == 'ubuntu-latest'"
@@ -107,10 +98,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.13'
 

{sxs-2025.0.18 → sxs-2025.0.20}/CITATION.cff

@@ -16,5 +16,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2025.0.18
-date-released: 2025-07-21
+version: 2025.0.20
+date-released: 2025-11-25

{sxs-2025.0.18 → sxs-2025.0.20}/PKG-INFO

@@ -1,35 +1,14 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.18
+Version: 2025.0.20
 Summary: Interface to data produced by the Simulating eXtreme Spacetimes collaboration
 Project-URL: Homepage, https://github.com/sxs-collaboration/sxs
 Project-URL: Documentation, https://sxs.readthedocs.io/
 Author-email: Michael Boyle <michael.oliver.boyle@gmail.com>
-License: The MIT License (MIT)
-        
-        Copyright (c) 2020 Michael Boyle
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
+License-Expression: MIT
 License-File: LICENSE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Astronomy
@@ -38,9 +17,9 @@ Requires-Python: >=3.10
 Requires-Dist: bibtexparser>=2.0.0b8
 Requires-Dist: h5py>=3
 Requires-Dist: inflection>=0.5.1
-Requires-Dist: juliacall>=0.9.20
+Requires-Dist: juliacall>=0.9.30
 Requires-Dist: numba>=0.55; implementation_name == 'cpython'
-Requires-Dist: numpy>=1.25
+Requires-Dist: numpy<3.0,>=2.0
 Requires-Dist: packaging
 Requires-Dist: pandas>=1.1.2
 Requires-Dist: pytz>=2020.1
@@ -64,7 +43,7 @@ Requires-Dist: line-profiler>=3.0.2; extra == 'ecosystem'
 Requires-Dist: matplotlib>=2.1.1; extra == 'ecosystem'
 Requires-Dist: memory-profiler>=0.57.0; extra == 'ecosystem'
 Requires-Dist: numpy-quaternion>=2023.0.4; extra == 'ecosystem'
-Requires-Dist: numpy<2.0,>=1.20; extra == 'ecosystem'
+Requires-Dist: numpy<3.0,>=2.0; extra == 'ecosystem'
 Requires-Dist: qgridnext>=2.0; extra == 'ecosystem'
 Requires-Dist: rise>=5.6.1; extra == 'ecosystem'
 Requires-Dist: scri>=2020.8.18; (sys_platform != 'win32') and extra == 'ecosystem'

{sxs-2025.0.18 → sxs-2025.0.20}/pyproject.toml

@@ -4,12 +4,12 @@ dynamic = ["version"]
 description = "Interface to data produced by the Simulating eXtreme Spacetimes collaboration"
 readme = "README.md"
 requires-python = ">=3.10"
-license = {file = "LICENSE"}
+license = "MIT"
+license-files = ["LICENSE"]
 authors = [
   { name = "Michael Boyle", email = "michael.oliver.boyle@gmail.com" }
 ]
 classifiers = [
-  "License :: OSI Approved :: MIT License",
   "Development Status :: 5 - Production/Stable",
   "Programming Language :: Python :: 3",
   "Operating System :: OS Independent",
@@ -19,7 +19,7 @@ classifiers = [
 ]
 dependencies = [
   "sxscatalog >=3.0.14",
-  "numpy >=1.25",
+  "numpy >=2.0, <3.0",
   "scipy >=1.13",
   "numba >=0.55; implementation_name == 'cpython'",
   "quaternionic >=1.0.15",
@@ -32,7 +32,7 @@ dependencies = [
   "urllib3 >=1.25.10",
   "pandas >=1.1.2",
   "bibtexparser >=2.0.0b8",
-  "juliacall >=0.9.20",
+  "juliacall >=0.9.30",
   "packaging",
 ]
 
@@ -50,7 +50,7 @@ ecosystem = [
   "line_profiler >=3.0.2",
   "memory_profiler >=0.57.0",
   "matplotlib >=2.1.1",
-  "numpy >=1.20, <2.0",
+  "numpy >=2.0, <3.0",
   "sympy >=1.6.2",
   "seaborn >=0.13",
   "qgridnext >=2.0",
@@ -77,13 +77,14 @@ build-backend = "hatchling.build"
 path = "sxs/__version__.py"
 
 [tool.hatch.envs.default]
+installer = "uv"
 dependencies = [
   "ipython",
   "pytest",
   "pytest-cov",
   "pytest-forked >=1.3.0",
   "juliapkg >=0.1.13",
-  "numpy >=1.20, <2.0"
+  "numpy >=2.0, <3.0"
 ]
 [tool.hatch.envs.default.scripts]
 # Run these as `hatch run test`
@@ -114,7 +115,7 @@ dependencies = [
 
 [tool.black]
 line-length = 120
-target-version = ["py38"]
+target-version = ["py310"]
 
 
 [tool.pytest.ini_options]

sxs-2025.0.20/sxs/__version__.py

@@ -0,0 +1 @@
+__version__ = "2025.0.20"

{sxs-2025.0.18 → sxs-2025.0.20}/sxs/horizons/__init__.py

@@ -530,3 +530,38 @@ class Horizons(object):
     ω = Ω
     Omega = Ω
     omega = Ω
+
+    @property
+    def χₚ(self):
+        """Effective spin precession parameter χₚ as function of time
+
+        Returns
+        -------
+        χₚ : TimeSeries
+            This represents the effective spin precession parameter as
+            a function of time.
+
+        Notes
+        -----
+        There are multiple definitions of the effective spin
+        precession parameter in the literature.  This implementation
+        follows the definition given in Eq. (16) of the LVK's most
+        recent paper as of this writing,
+        [*GWTC-4.0*](https://arxiv.org/pdf/2508.18080).  See [this
+        paper](https://arxiv.org/abs/2011.11948) for discussion of the
+        differences between various definitions.
+
+        """
+        m1 = self.A.christodoulou_mass
+        m2 = self.B.christodoulou_mass
+        S1 = m1[:, np.newaxis] ** 2 * self.A.chi_inertial
+        S2 = m2[:, np.newaxis] ** 2 * self.B.chi_inertial
+        L̂ = self.ℓ̂
+        χₚ = (1 / m1) * np.maximum(
+            np.linalg.norm(np.cross(L̂, S1), axis=1) / m1,
+            ((3*m1 + 4*m2)/(3*m2+4*m1)) * np.linalg.norm(np.cross(L̂, S2), axis=1) / m2
+        )
+        return χₚ
+
+    χp = χₚ
+    chi_p = χₚ

{sxs-2025.0.18 → sxs-2025.0.20}/sxs/juliapkg.json

@@ -1,9 +1,9 @@
 {
-    "julia": "1.11",
+    "julia": "1.12",
     "packages": {
         "PostNewtonian": {
             "uuid": "377afc40-5642-4616-8613-b7ebca523866",
-            "version": "0.10.5"
+            "version": "0.10.9"
         }
     }
 }

{sxs-2025.0.18 → sxs-2025.0.20}/sxs/simulations/simulation.py

@@ -915,7 +915,7 @@ class Simulation_v2(SimulationBase):
             f"/rMPsi4_Asymptotic_GeometricUnits_CoM_Mem/{extrapolation}"
         )
 
-    def load_waveform(self, file_name, group, transform_to_inertial=True):
+    def load_waveform(self, file_name, group, transform_to_inertial=True, drop_times_before=0):
         from .. import load
         # Note that `name` should not have the file ending on input,
         # but we will replace it regardless with `.with_suffix`.
@@ -934,7 +934,7 @@ class Simulation_v2(SimulationBase):
             download_file(json_location, json_truepath)
         return load(
             h5_location, truepath=h5_truepath, group=group, metadata=self.metadata,
-            transform_to_inertial=transform_to_inertial, drop_times_before=0,
+            transform_to_inertial=transform_to_inertial, drop_times_before=drop_times_before,
         )
 
 

{sxs-2025.0.18 → sxs-2025.0.20}/sxs/time_series.py

@@ -121,8 +121,20 @@ class TimeSeries(np.ndarray):
         """
         from numbers import Integral
 
+        # The docs at
+        # https://numpy.org/doc/stable/user/basics.indexing.html#detailed-notes
+        # say, "An empty (tuple) index is a full scalar index into a
+        # zero-dimensional array.  `x[()]` returns a *scalar* if `x`
+        # is zero-dimensional and a view otherwise. On the other hand,
+        # `x[...]` always returns a view."  This was true in numpy 1 as well,
+        # but the behavior has actually changed in numpy 2 for non-0d arrays,
+        # which causes downstream errors.  So we have to change to handle this.
         if isinstance(key, tuple) and len(key) == 0:
-            raise ValueError(f"Empty index to {type(self).__name__} does not make sense")
+            if self.ndim == 0:
+                return super().__getitem__(key), key
+            else:
+                return self, key
+            # raise ValueError(f"Empty index to {type(self).__name__} does not make sense")
 
         def newaxis_type(e):
             return isinstance(e, (type(np.newaxis), type(None)))

{sxs-2025.0.18 → sxs-2025.0.20}/tests/test_waveform_rotations.py

@@ -6,6 +6,8 @@ import sxs
 from .conftest import skip_macOS_GH_actions_downloads
 from .conftest import constant_waveform, linear_waveform, random_waveform
 
+print("numpy: ", np.__version__)
+
 
 @skip_macOS_GH_actions_downloads
 def test_modes_rotate(h, eps):

{sxs-2025.0.18 → sxs-2025.0.20}/tests/test_waveforms.py

@@ -151,6 +151,10 @@ def test_modes_squared_angular_momenta():
     import spherical as sf
     tolerance = 1e-13
     np.random.seed(1234)
+
+    def allclose(a, b):
+        return np.allclose(a.ndarray, b.ndarray, rtol=tolerance, atol=tolerance)
+
     L2 = sf.Modes.Lsquared
     Lz = sf.Modes.Lz
     Lp = sf.Modes.Lplus
@@ -168,17 +172,17 @@ def test_modes_squared_angular_momenta():
         # Test L^2 = 0.5(L+L- + L-L+) + LzLz
         m1 = L2(m)
         m2 = 0.5 * (Lp(Lm(m)) + Lm(Lp(m))) + Lz(Lz(m))
-        assert np.allclose(m1, m2, rtol=tolerance, atol=tolerance)
+        assert allclose(m1, m2)
 
         # Test R^2 = 0.5(R+R- + R-R+) + RzRz
         m1 = R2(m)
         m2 = 0.5 * (Rp(Rm(m)) + Rm(Rp(m))) + Rz(Rz(m))
-        assert np.allclose(m1, m2, rtol=tolerance, atol=tolerance)
+        assert allclose(m1, m2)
 
         # Test L^2 = R^2
         m1 = L2(m)
         m2 = R2(m)
-        assert np.allclose(m1, m2, rtol=tolerance, atol=tolerance)
+        assert allclose(m1, m2)
 
 
 def test_modes_derivative_commutators():
@@ -188,7 +192,6 @@ def test_modes_derivative_commutators():
     # Note that post-fix operators are in the opposite order compared
     # to prefixed commutators, so we pull the post-fix operators out
     # as functions to make things look right.
-    np.random.seed(1234)
     L2 = sf.Modes.Lsquared
     Lz = sf.Modes.Lz
     Lp = sf.Modes.Lplus
@@ -199,6 +202,10 @@ def test_modes_derivative_commutators():
     Rm = sf.Modes.Rminus
     eth = lambda modes: modes.eth
     ethbar = lambda modes: modes.ethbar
+
+    def allclose(a, b):
+        return np.allclose(a.ndarray, b.ndarray, rtol=tolerance, atol=tolerance)
+
     for s in range(-2, 2+1):
         ell_min = abs(s)
         ell_max = 8
@@ -215,19 +222,19 @@ def test_modes_derivative_commutators():
         for R in [Rz, Rp, Rm]:
             assert np.max(np.abs(R2(R(m)) - R(R2(m)))) < 5*tolerance
         # Test [Lz, Lp] = Lp
-        assert np.allclose(Lz(Lp(m)) - Lp(Lz(m)), Lp(m), rtol=tolerance, atol=tolerance)
+        assert allclose(Lz(Lp(m)) - Lp(Lz(m)), Lp(m))
         # Test [Lz, Lm] = -Lm
-        assert np.allclose(Lz(Lm(m)) - Lm(Lz(m)), -Lm(m), rtol=tolerance, atol=tolerance)
+        assert allclose(Lz(Lm(m)) - Lm(Lz(m)), -Lm(m))
         # Test [Lp, Lm] = 2Lz
-        assert np.allclose(Lp(Lm(m)) - Lm(Lp(m)), 2 * Lz(m), rtol=tolerance, atol=tolerance)
+        assert allclose(Lp(Lm(m)) - Lm(Lp(m)), 2 * Lz(m))
         # Test [Rz, Rp] = Rp
-        assert np.allclose(Rz(Rp(m)) - Rp(Rz(m)), Rp(m), rtol=tolerance, atol=tolerance)
+        assert allclose(Rz(Rp(m)) - Rp(Rz(m)), Rp(m))
         # Test [Rz, Rm] = -Rm
-        assert np.allclose(Rz(Rm(m)) - Rm(Rz(m)), -Rm(m), rtol=tolerance, atol=tolerance)
+        assert allclose(Rz(Rm(m)) - Rm(Rz(m)), -Rm(m))
         # Test [Rp, Rm] = 2Rz
-        assert np.allclose(Rp(Rm(m)) - Rm(Rp(m)), 2 * Rz(m), rtol=tolerance, atol=tolerance)
+        assert allclose(Rp(Rm(m)) - Rm(Rp(m)), 2 * Rz(m))
         # Test [ethbar, eth] = 2s
-        assert np.allclose(ethbar(eth(m)) - eth(ethbar(m)), 2 * m.s * m, rtol=tolerance, atol=tolerance)
+        assert allclose(ethbar(eth(m)) - eth(ethbar(m)), 2 * m.s * m)
 
 
 @skip_macOS_GH_actions_downloads

sxs-2025.0.18/sxs/__version__.py

@@ -1 +0,0 @@
-__version__ = "2025.0.18"