From 9a46090fcbcfd585da0f312e15263d00d8fee39f Mon Sep 17 00:00:00 2001 From: mj-will Date: Tue, 8 Oct 2024 16:45:13 +0100 Subject: [PATCH 1/7] CI: test on Python 3.13 --- .github/workflows/integration-tests.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8554f1e4..1e3b5aa6 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [macOS, Ubuntu, Windows] - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] runs-on: ${{ matrix.os }}-latest steps: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9435f110..764dcb8d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [macOS, Ubuntu, Windows] - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] runs-on: ${{ matrix.os }}-latest steps: From 26766b4e563127b5a90193321f439cf6192268f9 Mon Sep 17 00:00:00 2001 From: mj-will Date: Mon, 13 Jan 2025 13:25:29 +0000 Subject: [PATCH 2/7] CI: remove upper limit on scipy version --- ci_environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_environment.yaml b/ci_environment.yaml index d20bf449..32c1ffe6 100644 --- a/ci_environment.yaml +++ b/ci_environment.yaml @@ -6,7 +6,7 @@ channels: dependencies: - numpy - pandas - - scipy>=0.16, <1.14 # tmp fix for a bilby issue + - scipy>=0.16 - matplotlib>=2.0 - seaborn - pytorch>=1.11.0 From c707be6dcaabd0b1655d412fa103530e83dfaa56 Mon Sep 17 00:00:00 2001 From: mj-will Date: Wed, 22 Jan 2025 16:59:44 +0000 Subject: [PATCH 3/7] CI: remove `default` channel for conda --- ci_environment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci_environment.yaml b/ci_environment.yaml index 32c1ffe6..2f2763fe 100644 --- a/ci_environment.yaml +++ b/ci_environment.yaml @@ -1,6 +1,5 @@ name: nessai-ci channels: - - default - pytorch - conda-forge dependencies: From 0d0d8546aef428e407ff347dd6ea9ff0723430ea Mon Sep 17 00:00:00 2001 From: mj-will Date: Thu, 23 Jan 2025 11:11:33 +0000 Subject: [PATCH 4/7] CI: only install faiss for python < 3.13 --- ci_environment.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci_environment.yaml b/ci_environment.yaml index 2f2763fe..862401c6 100644 --- a/ci_environment.yaml +++ b/ci_environment.yaml @@ -15,13 +15,14 @@ dependencies: - corner - bilby - astropy - - faiss-cpu>=1.7.3,!=1.7.4 # conda release for 1.7.4 is broken - multiprocess - pytest - pytest-cov - pytest-timeout - pytest-rerunfailures - pytest-integration + - python<3.13: + - faiss-cpu>=1.7.3,!=1.7.4 # conda release for 1.7.4 is broken - pip - pip: - nflows From edbad045adec03dac2623fd33277d5cc52bb6d83 Mon Sep 17 00:00:00 2001 From: mj-will Date: Thu, 23 Jan 2025 11:36:59 +0000 Subject: [PATCH 5/7] CI: remove faiss from env --- ci_environment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci_environment.yaml b/ci_environment.yaml index 862401c6..85288e6f 100644 --- a/ci_environment.yaml +++ b/ci_environment.yaml @@ -21,8 +21,6 @@ dependencies: - pytest-timeout - pytest-rerunfailures - pytest-integration - - python<3.13: - - faiss-cpu>=1.7.3,!=1.7.4 # conda release for 1.7.4 is broken - pip - pip: - nflows From d45320f21df5f5457aed79f1a5f22e92cb8cf743 Mon Sep 17 00:00:00 2001 From: mj-will Date: Thu, 23 Jan 2025 11:46:16 +0000 Subject: [PATCH 6/7] CI: remove `nflows`from CI env --- ci_environment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci_environment.yaml b/ci_environment.yaml index 85288e6f..63ce3d68 100644 --- a/ci_environment.yaml +++ b/ci_environment.yaml @@ -23,5 +23,4 @@ dependencies: - pytest-integration - pip - pip: - - nflows - ray[default] ; (sys_platform != 'win32' and python_version < '3.12') or (sys_platform == 'win32' and python_version < '3.12') From 03035009e8b423b306b62022183d4ecedfa09de9 Mon Sep 17 00:00:00 2001 From: mj-will Date: Thu, 23 Jan 2025 14:15:51 +0000 Subject: [PATCH 7/7] CI: install pytorch from conda-forge --- ci_environment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci_environment.yaml b/ci_environment.yaml index 63ce3d68..ad9123ec 100644 --- a/ci_environment.yaml +++ b/ci_environment.yaml @@ -1,6 +1,5 @@ name: nessai-ci channels: - - pytorch - conda-forge dependencies: - numpy @@ -8,8 +7,7 @@ dependencies: - scipy>=0.16 - matplotlib>=2.0 - seaborn - - pytorch>=1.11.0 - - cpuonly + - pytorch-cpu>=2.0 - glasflow - h5py - corner