From 51e80492e881bf57c0fe6dcd2096933b9adf6270 Mon Sep 17 00:00:00 2001 From: bd-j Date: Thu, 27 Apr 2023 15:30:55 +0000 Subject: [PATCH 1/6] Updating FSPS --- src/fsps/libfsps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsps/libfsps b/src/fsps/libfsps index ce7764ae..793fb4e2 160000 --- a/src/fsps/libfsps +++ b/src/fsps/libfsps @@ -1 +1 @@ -Subproject commit ce7764aed517507e10ef54b4238217fd5af9880b +Subproject commit 793fb4e25383c843730cce94ebb64fb2f8518561 From f48f2d2f9149d6aa5e6c1edaa6364a835c895136 Mon Sep 17 00:00:00 2001 From: Benjamin Johnson Date: Thu, 27 Apr 2023 11:39:11 -0400 Subject: [PATCH 2/6] Include add_xrb in source list. --- src/fsps/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fsps/meson.build b/src/fsps/meson.build index 29813833..9871ef1e 100644 --- a/src/fsps/meson.build +++ b/src/fsps/meson.build @@ -21,6 +21,7 @@ lib_source = [ 'libfsps/src/add_nebular.f90', 'libfsps/src/add_remnants.f90', 'libfsps/src/agn_dust.f90', + 'libfsps/src/agn_xrb.f90', 'libfsps/src/attn_curve.f90', 'libfsps/src/compsp.f90', 'libfsps/src/csp_gen.f90', From a8aea440d92e2dd2a1a476ca00d532d49b5cc8fb Mon Sep 17 00:00:00 2001 From: Benjamin Johnson Date: Thu, 27 Apr 2023 11:44:49 -0400 Subject: [PATCH 3/6] fix typo. --- src/fsps/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsps/meson.build b/src/fsps/meson.build index 9871ef1e..3390d53d 100644 --- a/src/fsps/meson.build +++ b/src/fsps/meson.build @@ -20,8 +20,8 @@ lib_source = [ 'libfsps/src/add_dust.f90', 'libfsps/src/add_nebular.f90', 'libfsps/src/add_remnants.f90', + 'libfsps/src/add_xrb.f90', 'libfsps/src/agn_dust.f90', - 'libfsps/src/agn_xrb.f90', 'libfsps/src/attn_curve.f90', 'libfsps/src/compsp.f90', 'libfsps/src/csp_gen.f90', From 169b6ef205f72cb866f74eaee63a793a70c151d2 Mon Sep 17 00:00:00 2001 From: Dan Foreman-Mackey Date: Thu, 27 Apr 2023 12:06:29 -0400 Subject: [PATCH 4/6] Place upper limit on meson-python version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8d3e71d5..b593e770 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ test = ["pytest", "pytest-xdist"] [build-system] build-backend = 'mesonpy' -requires = ["meson-python>=0.8.1", "wheel", "oldest-supported-numpy", "setuptools_scm"] +requires = ["meson-python>=0.8.1,<0.13.0", "wheel", "oldest-supported-numpy", "setuptools_scm"] [tool.setuptools_scm] write_to = "src/fsps/fsps_version.py" From dcfd0ac36683565151134bb0c1020fa0452f8ee4 Mon Sep 17 00:00:00 2001 From: Dan Foreman-Mackey Date: Thu, 27 Apr 2023 12:15:29 -0400 Subject: [PATCH 5/6] Disabling Windows release builds --- .github/workflows/release.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fd6d3f4..1f85df8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: buildplat: - [ubuntu-20.04, manylinux, x86_64] - [macos-12, macosx, x86_64] - - [windows-2019, win, AMD64] + # - [windows-2019, win, AMD64] python: [["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"]] steps: - uses: actions/checkout@v3 diff --git a/pyproject.toml b/pyproject.toml index b593e770..8d3e71d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ test = ["pytest", "pytest-xdist"] [build-system] build-backend = 'mesonpy' -requires = ["meson-python>=0.8.1,<0.13.0", "wheel", "oldest-supported-numpy", "setuptools_scm"] +requires = ["meson-python>=0.8.1", "wheel", "oldest-supported-numpy", "setuptools_scm"] [tool.setuptools_scm] write_to = "src/fsps/fsps_version.py" From eb02e7f0840ab06004207e1f13d20d67c114fce5 Mon Sep 17 00:00:00 2001 From: Dan Foreman-Mackey Date: Thu, 27 Apr 2023 12:33:38 -0400 Subject: [PATCH 6/6] Skip windows tests too --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ab319e4..91cfcf9b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,9 +20,9 @@ jobs: - os: macos-latest python-version: "3.10" nox-session: "tests" - - os: windows-latest - python-version: "3.10" - nox-session: "tests" + # - os: windows-latest + # python-version: "3.10" + # nox-session: "tests" - os: ubuntu-latest python-version: "3.10" nox-session: "options"