Update v0.13.4 authored by Charlie Hoy's avatar Charlie Hoy
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
# Release details # Release details
This release cherry-picks the relevant commits from https://git.ligo.org/lscsoft/pesummary/-/merge_requests/658, https://git.ligo.org/lscsoft/pesummary/-/merge_requests/668 and https://git.ligo.org/lscsoft/pesummary/-/merge_requests/691 to the [`v0.13.3`](https://git.ligo.org/lscsoft/pesummary/-/tags/v0.13.3) tag. A diff between the `release_v0.13.4` branch and `v0.13.3` tag can be seen below. The pipeline for the `release_v0.13.4` branch can be seen [here](https://git.ligo.org/lscsoft/pesummary/-/pipelines/402035). This release cherry-picks the relevant commits from https://git.ligo.org/lscsoft/pesummary/-/merge_requests/691 to the [`v0.13.3`](https://git.ligo.org/lscsoft/pesummary/-/tags/v0.13.3) tag. In order to ensure that this release passes the testing suite, we also cherry-picked the relevant commits from https://git.ligo.org/lscsoft/pesummary/-/merge_requests/658, https://git.ligo.org/lscsoft/pesummary/-/merge_requests/668 and commit 394dd514. A diff between the `release_v0.13.4` branch and `v0.13.3` tag can be seen below. The pipeline for the `release_v0.13.4` branch can be seen [here](https://git.ligo.org/lscsoft/pesummary/-/pipelines/402035).
394dd514
<details><summary>git diff v0.13.3</summary> <details><summary>git diff v0.13.3</summary>
...@@ -27,56 +29,6 @@ index a09f7fb..eacb4d2 100644 ...@@ -27,56 +29,6 @@ index a09f7fb..eacb4d2 100644
+ allow_failure: true + allow_failure: true
python-3.8-base:
diff --git a/docs/build_docs.sh b/docs/build_docs.sh
index 2ea52e0..6df7d60 100644
--- a/docs/build_docs.sh
+++ b/docs/build_docs.sh
@@ -19,7 +19,7 @@ set -e
stable=$(git describe --abbrev=0 || git rev-parse --abbrev-ref HEAD)
# get pesummary version from IGWN Conda Distribution
-igwn_yaml="https://computing.docs.ligo.org/conda/environments/linux/igwn-py37.yaml"
+igwn_yaml="https://computing.docs.ligo.org/conda/environments/linux/igwn-py38.yaml"
igwn_version=$(python -c "
import requests, yaml;
py38 = yaml.safe_load(requests.get('${igwn_yaml}').content)['dependencies'];
diff --git a/pesummary/gw/cosmology.py b/pesummary/gw/cosmology.py
index 6b9ff7c..912fa22 100644
--- a/pesummary/gw/cosmology.py
+++ b/pesummary/gw/cosmology.py
@@ -2,13 +2,14 @@
from pesummary import conf
from astropy import cosmology as cosmo
+from astropy.cosmology import parameters
__author__ = ["Charlie Hoy <charlie.hoy@ligo.org>"]
-_available_cosmologies = list(cosmo.parameters.available) + ["Planck15_lal"]
-_available_cosmologies += [
- _cosmology + "_with_Riess2019_H0" for _cosmology in _available_cosmologies
(pesummary_non_gw) [22:36:14: pesummary] (git: release_v0.13.4) $ git diff v0.13.3 > diff.patch
(pesummary_non_gw) [22:36:18: pesummary] (git: release_v0.13.4) $ cat diff.patch
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a09f7fb..eacb4d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,7 +144,7 @@ style:
documentation:
stage: basic
- image: python:3.7-buster
+ image: python:3.8-buster
needs:
- tarball
script:
@@ -231,6 +231,7 @@ python-3.7-exe:
- *finalise_testing
- mv _testing/.coverage* .
- mv .coverage .coverage_exe
+ allow_failure: true
python-3.8-base: python-3.8-base:
diff --git a/docs/build_docs.sh b/docs/build_docs.sh diff --git a/docs/build_docs.sh b/docs/build_docs.sh
index 2ea52e0..6df7d60 100644 index 2ea52e0..6df7d60 100644
...@@ -190,6 +142,20 @@ index 702e917..6061723 100644 ...@@ -190,6 +142,20 @@ index 702e917..6061723 100644
+ vars(astropy_cosmology)[key][_] == value[_] for _ + vars(astropy_cosmology)[key][_] == value[_] for _
+ in range(len(vars(astropy_cosmology)[key])) + in range(len(vars(astropy_cosmology)[key]))
+ ) + )
diff --git a/pesummary/tests/fetch_test.py b/pesummary/tests/fetch_test.py
index 741d741..6788c7c 100644
--- a/pesummary/tests/fetch_test.py
+++ b/pesummary/tests/fetch_test.py
@@ -82,7 +82,8 @@ def test_fetch_open_samples():
"""
data = fetch_open_samples("GW150914")
_data = requests.get(
- "https://dcc.ligo.org/public/0157/P1800370/005/GW150914_GWTC-1.hdf5"
+ "https://zenodo.org/api/files/ecf41927-9275-47da-8b37-e299693fe5cb/" +
+ "IGWN-GWTC2p1-v2-GW150914_095045_PEDataRelease_mixed_cosmo.h5"
)
with open("GW150914_posterior_samples.h5", "wb") as f:
f.write(_data.content)
diff --git a/pesummary/tests/pycbc.sh b/pesummary/tests/pycbc.sh diff --git a/pesummary/tests/pycbc.sh b/pesummary/tests/pycbc.sh
index 1949edf..f14799f 100644 index 1949edf..f14799f 100644
--- a/pesummary/tests/pycbc.sh --- a/pesummary/tests/pycbc.sh
... ...
......