From ab71fded7aeaf19b937ab531467ce85cea1cbbc6 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Tue, 7 Sep 2021 14:32:21 +0100 Subject: [PATCH 1/7] pesummary: 0.13.1 https://git.ligo.org/sccb/requests/-/issues/733 (cherry picked from commit 38e7160973a1fd95751e1f3b5188bf4afe936df5) --- packages/pesummary.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/pesummary.yaml b/packages/pesummary.yaml index 04ca07cac..5131a32d8 100644 --- a/packages/pesummary.yaml +++ b/packages/pesummary.yaml @@ -1,14 +1,12 @@ package: name: pesummary - version: 0.12.1 + version: 0.13.1 build_string: pyhd8ed1ab_0 skip: true # [win] test: - # this test is broken on py39 because of pandas >=1.0.0 - # we need bilby to upgrade to not use deepdish - pytest: --pyargs pesummary.tests.read_test # [py<39] + pytest: --pyargs pesummary.tests.read_test commands: - summarytest --type imports - summarytest --type executables -- GitLab From 49eef38f314c48cd33618073c30b46e8f48851b8 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Tue, 21 Dec 2021 09:51:36 +0000 Subject: [PATCH 2/7] pesummary 0.13.3 https://git.ligo.org/sccb/requests/-/issues/809 (cherry picked from commit d986b99cedf4cab572898981980776123c63c1af) --- packages/pesummary.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/pesummary.yaml b/packages/pesummary.yaml index 5131a32d8..81805a987 100644 --- a/packages/pesummary.yaml +++ b/packages/pesummary.yaml @@ -1,8 +1,9 @@ package: name: pesummary - version: 0.13.1 - build_string: pyhd8ed1ab_0 + version: 0.13.3 + build_string: pyhd8ed1ab_1 +# requires lalsuite skip: true # [win] test: -- GitLab From 5298457b2d0caa7afb1505814d6352da40179d78 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Thu, 9 Dec 2021 16:24:14 +0000 Subject: [PATCH 3/7] pesummary 0.13.3: improve tests run the pytest suite in an temporary directory to isolate log files and the .outdir that the tests use (cherry picked from commit e3f19f800db95342dc6167684bd78033170341dd) (cherry picked from commit ca526b9a0fadd328c9704dc29f00c91f5ffa5dd1) --- packages/pesummary-tests.sh | 19 +++++++++++++++++++ packages/pesummary.yaml | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 packages/pesummary-tests.sh diff --git a/packages/pesummary-tests.sh b/packages/pesummary-tests.sh new file mode 100644 index 000000000..5db457a35 --- /dev/null +++ b/packages/pesummary-tests.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# IGWN Conda Distribution tests for PESummary +# + +# run everything in a temporary directory +TMPDIR=$(mktemp -d -t lscsoft-glue-XXXXXXXXXX) +trap "cd ~ && rm -rf ${TMPDIR}" EXIT +cd ${TMPDIR} + +# set XDG_CACHE_DIR to redirect pesummary logs +export XDG_CACHE_DIR="$(pwd)/.cache" + +# run the pytest suite +python -m pytest \ + -ra \ + --verbose \ + --pyargs pesummary.tests.read_test \ +; diff --git a/packages/pesummary.yaml b/packages/pesummary.yaml index 81805a987..144818b46 100644 --- a/packages/pesummary.yaml +++ b/packages/pesummary.yaml @@ -7,7 +7,6 @@ package: skip: true # [win] test: - pytest: --pyargs pesummary.tests.read_test + script: pesummary-tests.sh commands: - - summarytest --type imports - summarytest --type executables -- GitLab From 4dd855ef3cb16d0fd15d4d13bd626ed4fa9cbee6 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Tue, 21 Dec 2021 08:52:53 +0000 Subject: [PATCH 4/7] remove p-astro this will be replaced by ligo.em-bright (cherry picked from commit a7e3c87a7430eb4277c2490337867e35bf96a360) --- packages/p_astro.yaml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 packages/p_astro.yaml diff --git a/packages/p_astro.yaml b/packages/p_astro.yaml deleted file mode 100644 index 486cac7e9..000000000 --- a/packages/p_astro.yaml +++ /dev/null @@ -1,13 +0,0 @@ -package: - name: p_astro - version: 0.8.2 - build_string: py_0 - -# scikit-learn pin is too tight (old) for py39 -skip: true # [win or py>=39] - -test: - import: - - ligo.computeDiskMass - - ligo.em_bright - - ligo.p_astro -- GitLab From a3bff5229aed7df31eb70d42636864dfbe497017 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Tue, 21 Dec 2021 09:49:21 +0000 Subject: [PATCH 5/7] ligo.em-bright 0.1.2 https://git.ligo.org/sccb/requests/-/issues/764 (cherry picked from commit 6fe1a712b6db81f02c0dae7a6e4885cdc0e90031) --- packages/ligo.em-bright.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/ligo.em-bright.yaml diff --git a/packages/ligo.em-bright.yaml b/packages/ligo.em-bright.yaml new file mode 100644 index 000000000..2066e39c3 --- /dev/null +++ b/packages/ligo.em-bright.yaml @@ -0,0 +1,10 @@ +package: + name: ligo.em-bright + version: 0.1.2 + build_string: pyhd8ed1ab_0 + +# requires lalsuite +skip: true # [win] + +test: + pytest: --pyargs ligo.em_bright -- GitLab From 0d57bd03f7952d5ac3e09d22b9cc199f7b96fa79 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Mon, 13 Dec 2021 10:14:48 +0000 Subject: [PATCH 6/7] testfixtures required for pesummary testing (cherry picked from commit 5c5e6afffbf48e994bed26b2ae42b0c82971fa41) (cherry picked from commit 1c166d299b3b497e4b20c1e7fbcb1176d4b78895) --- packages/upstream.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/upstream.yaml b/packages/upstream.yaml index 0960c40db..385368b4d 100644 --- a/packages/upstream.yaml +++ b/packages/upstream.yaml @@ -171,6 +171,7 @@ dependencies: - sqlalchemy=1.3.23 - swig=3.0.12 # [py<39] - swig=4.0.2 # [py>=39] + - testfixtures - tmux=3.1 # [not win] - tqdm=4.45.0 - twine -- GitLab From 0647a1d0811c180235d9fb78f14ff3ed7cc4c309 Mon Sep 17 00:00:00 2001 From: Duncan Macleod <duncan.macleod@ligo.org> Date: Tue, 21 Dec 2021 17:15:22 +0000 Subject: [PATCH 7/7] ci: set USER variable in tests some tests require them (cherry picked from commit 3a4cbda840826094db5e86d92c2e035116201275) --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index deacbf112..095dbdbef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -295,6 +295,8 @@ render:win:testing: OPENBLAS_NUM_THREADS: 1 NUMEXPR_NUM_THREADS: 1 TF_NUM_THREADS: 1 + # set variables to help the tests + USER: "igwn-conda" script: # parse job name to get OS and environment - read OS_NAME ENV_NAME <<<$(echo ${CI_JOB_NAME} | awk -F':' '{print $2,$3}') -- GitLab