... | ... | @@ -7,6 +7,40 @@ This release cherry-picks the relevant commits from https://git.ligo.org/lscsoft |
|
|
<details><summary>diff</summary>
|
|
|
|
|
|
```bash
|
|
|
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:
|
|
|
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
|
... | ... | @@ -123,14 +157,15 @@ index 1949edf..f14799f 100644 |
|
|
summarypages --webdir ./outdir/webpage --samples ./pycbc.hdf5 --gw --path_to_samples samples
|
|
|
+
|
|
|
diff --git a/testing_requirements.txt b/testing_requirements.txt
|
|
|
index 2dc3945..04cfe2e 100644
|
|
|
index 2dc3945..e5af77d 100644
|
|
|
--- a/testing_requirements.txt
|
|
|
+++ b/testing_requirements.txt
|
|
|
@@ -1,3 +1,3 @@
|
|
|
@@ -1,3 +1,4 @@
|
|
|
-pycbc
|
|
|
+pycbc>=2.0.3
|
|
|
cython>=0.28.5
|
|
|
astropy>=3.2.3,!=4.3.0
|
|
|
+markupsafe==2.0.1
|
|
|
```
|
|
|
|
|
|
</details>
|
... | ... | |