diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 5d14e5a2..3bdb49da 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 diff --git a/poetry.lock b/poetry.lock index de0b4598..f04ff8a1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -232,9 +232,6 @@ files = [ {file = "babel-2.16.0.tar.gz", hash = "sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316"}, ] -[package.dependencies] -pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} - [package.extras] dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] @@ -1591,11 +1588,9 @@ files = [ attrs = ">=22.2.0" fqdn = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} idna = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} -importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""} isoduration = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} jsonpointer = {version = ">1.13", optional = true, markers = "extra == \"format-nongpl\""} jsonschema-specifications = ">=2023.03.6" -pkgutil-resolve-name = {version = ">=1.3.10", markers = "python_version < \"3.9\""} referencing = ">=0.28.4" rfc3339-validator = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} rfc3986-validator = {version = ">0.1.0", optional = true, markers = "extra == \"format-nongpl\""} @@ -1619,7 +1614,6 @@ files = [ ] [package.dependencies] -importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""} referencing = ">=0.31.0" [[package]] @@ -1818,7 +1812,6 @@ files = [ async-lru = ">=1.0.0" httpx = ">=0.25.0" importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.10\""} -importlib-resources = {version = ">=1.4", markers = "python_version < \"3.9\""} ipykernel = ">=6.5.0" jinja2 = ">=3.0.3" jupyter-core = "*" @@ -2041,7 +2034,6 @@ files = [ [package.dependencies] astropy = "*" -importlib-resources = {version = ">=1.3.0", markers = "python_version < \"3.9\""} ligo-segments = "*" lscsoft-glue = "*" matplotlib = "*" @@ -2779,8 +2771,8 @@ files = [ [package.dependencies] numpy = [ {version = ">=1.20.3", markers = "python_version < \"3.10\""}, - {version = ">=1.21.0", markers = "python_version >= \"3.10\" and python_version < \"3.11\""}, {version = ">=1.23.2", markers = "python_version >= \"3.11\""}, + {version = ">=1.21.0", markers = "python_version >= \"3.10\" and python_version < \"3.11\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -2957,17 +2949,6 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa typing = ["typing-extensions"] xmp = ["defusedxml"] -[[package]] -name = "pkgutil-resolve-name" -version = "1.3.10" -description = "Resolve a name to an object." -optional = false -python-versions = ">=3.6" -files = [ - {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"}, - {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"}, -] - [[package]] name = "platformdirs" version = "4.3.6" @@ -4038,20 +4019,6 @@ pure-eval = "*" [package.extras] tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] -[[package]] -name = "sympy" -version = "1.12.1" -description = "Computer algebra system (CAS) in Python" -optional = false -python-versions = ">=3.8" -files = [ - {file = "sympy-1.12.1-py3-none-any.whl", hash = "sha256:9b2cbc7f1a640289430e13d2a56f02f867a1da0190f2f99d8968c2f74da0e515"}, - {file = "sympy-1.12.1.tar.gz", hash = "sha256:2877b03f998cd8c08f07cd0de5b767119cd3ef40d09f41c30d722f6686b0fb88"}, -] - -[package.dependencies] -mpmath = ">=1.1.0,<1.4.0" - [[package]] name = "sympy" version = "1.13.1" @@ -4193,10 +4160,7 @@ nvidia-nccl-cu12 = {version = "2.21.5", markers = "platform_system == \"Linux\" nvidia-nvjitlink-cu12 = {version = "12.4.127", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""} nvidia-nvtx-cu12 = {version = "12.4.127", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""} setuptools = {version = "*", markers = "python_version >= \"3.12\""} -sympy = [ - {version = "1.12.1", markers = "python_version == \"3.8\""}, - {version = "1.13.1", markers = "python_version >= \"3.9\""}, -] +sympy = {version = "1.13.1", markers = "python_version >= \"3.9\""} triton = {version = "3.1.0", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\" and python_version < \"3.13\""} typing-extensions = ">=4.8.0" @@ -4498,5 +4462,5 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" -python-versions = "^3.8,<3.13" -content-hash = "8a0cdbf2548734631da9fa8949f6fd55318868aa31dbe1d1f6168bc12de2d130" +python-versions = "^3.9,<3.13" +content-hash = "f0b02e64259742463c71d6bb9fd51f2a0e0221e63bb4a6851d3852b1dcc48939" diff --git a/pyproject.toml b/pyproject.toml index 15c216bc..4a43659f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ml4gw" -version = "0.6.2" +version = "0.6.3" description = "Tools for training torch models on gravitational wave data" readme = "README.md" authors = [ @@ -8,7 +8,7 @@ authors = [ ] [tool.poetry.dependencies] -python = "^3.8,<3.13" +python = "^3.9,<3.13" jaxtyping = "^0.2" @@ -59,18 +59,17 @@ include_trailing_comma = true [tool.tox] legacy_tox_ini = """ [tox] -envlist = py{38,39,310,311,312} +envlist = py{39,310,311,312} isolated_build = true [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 3.12: py312 -[testenv:py{38,39,310,311,312}] +[testenv:py{39,310,311,312}] deps = pytest>=7,<8 lalsuite>=7,<8 diff --git a/tests/waveforms/cbc/test_cbc_waveforms.py b/tests/waveforms/cbc/test_cbc_waveforms.py index 50774870..b4b628e4 100644 --- a/tests/waveforms/cbc/test_cbc_waveforms.py +++ b/tests/waveforms/cbc/test_cbc_waveforms.py @@ -72,19 +72,19 @@ def phi_jl(request): @pytest.fixture() def distance(request): - dist = Uniform(100, 300) + dist = Uniform(100, 3000) return dist.sample((N_SAMPLES,)) @pytest.fixture() def distance_far(request): - dist = Uniform(300, 3000) + dist = Uniform(400, 3000) return dist.sample((N_SAMPLES,)) @pytest.fixture() def distance_close(request): - dist = Uniform(100, 300) + dist = Uniform(100, 400) return dist.sample((N_SAMPLES,)) @@ -386,7 +386,7 @@ def test_phenom_p( # compare each waveform with lalsimulation for i in range(len(chirp_mass)): - # test far (> 300 Mpc) waveforms (O(1e-3) agreement) + # test far (> 400 Mpc) waveforms (O(1e-3) agreement) # construct lalinference params params = dict( @@ -465,7 +465,7 @@ def test_phenom_p( 1e21 * hc_lal_data.imag, 1e21 * hc_ml4gw.imag.numpy(), atol=1e-3 ) - # test close (< 300 Mpc) waveforms (O(1e-2) agreement) + # test close (< 400 Mpc) waveforms (O(1e-2) agreement) params["distance"] = (distance_close[i].item() * u.Mpc).to("m").value hp_lal, hc_lal = lalsimulation.SimInspiralChooseFDWaveform(**params)