... | @@ -2,7 +2,7 @@ |
... | @@ -2,7 +2,7 @@ |
|
|
|
|
|
# Release details
|
|
# Release details
|
|
|
|
|
|
This release cherry-picks the relevant commits from 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/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).
|
|
|
|
|
|
<details><summary>git diff v0.13.3</summary>
|
|
<details><summary>git diff v0.13.3</summary>
|
|
|
|
|
... | @@ -27,6 +27,56 @@ index a09f7fb..eacb4d2 100644 |
... | @@ -27,6 +27,56 @@ 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
|
... | @@ -156,6 +206,28 @@ index 1949edf..f14799f 100644 |
... | @@ -156,6 +206,28 @@ index 1949edf..f14799f 100644 |
|
pycbc_inference --config-file single.ini --output-file ./pycbc.hdf5
|
|
pycbc_inference --config-file single.ini --output-file ./pycbc.hdf5
|
|
summarypages --webdir ./outdir/webpage --samples ./pycbc.hdf5 --gw --path_to_samples samples
|
|
summarypages --webdir ./outdir/webpage --samples ./pycbc.hdf5 --gw --path_to_samples samples
|
|
+
|
|
+
|
|
|
|
diff --git a/pesummary/tests/webpage_test.py b/pesummary/tests/webpage_test.py
|
|
|
|
index f50d5c3..92eb43e 100644
|
|
|
|
--- a/pesummary/tests/webpage_test.py
|
|
|
|
+++ b/pesummary/tests/webpage_test.py
|
|
|
|
@@ -138,8 +138,15 @@ class TestPage(object):
|
|
|
|
soup = BeautifulSoup(fp, features="html.parser")
|
|
|
|
assert soup.div["class"] == ["highlight"]
|
|
|
|
all_entries = soup.find_all("span")
|
|
|
|
- assert all_entries[1].text == "[engine]"
|
|
|
|
- assert all_entries[2].text == "example"
|
|
|
|
+ _text = [ii.text for ii in all_entries]
|
|
|
|
+ for i in contents.split("\n"):
|
|
|
|
+ try:
|
|
|
|
+ assert i in _text
|
|
|
|
+ except AssertionError:
|
|
|
|
+ # the string 'example=' in the config file splits to 'example'
|
|
|
|
+ # and '=' in the html code block
|
|
|
|
+ assert i[:-1] in _text
|
|
|
|
+ assert i[-1] in _text
|
|
|
|
|
|
|
|
def test_table_of_images(self):
|
|
|
|
contents = [["image1.png"], ["image2.png"]]
|
|
diff --git a/testing_requirements.txt b/testing_requirements.txt
|
|
diff --git a/testing_requirements.txt b/testing_requirements.txt
|
|
index 2dc3945..e5af77d 100644
|
|
index 2dc3945..e5af77d 100644
|
|
--- a/testing_requirements.txt
|
|
--- a/testing_requirements.txt
|
... | | ... | |