From c057e0f3fda003bdf118288ae76996749b0dabf5 Mon Sep 17 00:00:00 2001
From: Patrick Godwin <patrick.godwin@ligo.org>
Date: Fri, 6 Jul 2018 11:24:59 -0700
Subject: [PATCH] horizonhistory.py: fix issues with failing doctests, update
.gitlab-ci.yml with doctests to skip in gstlal-inspiral
---
.gitlab-ci.yml | 2 +-
gstlal-inspiral/python/stats/horizonhistory.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 214c2660fb..7ad1518a83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,7 +179,7 @@ test:gstlal-inspiral:
script:
- apt-get install -y python-pytest
- cd gstlal-inspiral
- - python -m pytest -v --doctest-modules --ignore gst/python --ignore tests --ignore python/stats/inspiral_extrinsics.py
+ - python -m pytest -v --doctest-modules --ignore gst/python --ignore tests --ignore python/stats/inspiral_extrinsics.py --ignore python/lloidplots.py --ignore python/llweb.py --ignore python/plotsegments.py --ignore python/plotsensitivity.py --ignore python/snglinspiraltable.py --ignore python/spawaveform.py --ignore python/spiirparts.py --ignore python/webpage.py --ignore python/imr_utils.py
only:
- pushes
- schedules
diff --git a/gstlal-inspiral/python/stats/horizonhistory.py b/gstlal-inspiral/python/stats/horizonhistory.py
index a4509feaf6..7bac79d982 100644
--- a/gstlal-inspiral/python/stats/horizonhistory.py
+++ b/gstlal-inspiral/python/stats/horizonhistory.py
@@ -111,8 +111,8 @@ class NearestLeafTree(object):
>>> 103 in x
False
>>> import sys
- >>> x.to_xml(u"H1").write(sys.stdout) # doctest: +NORMALIZE_WHITESPACE
- <Array Type="real_8" Name="H1:nearestleaftree:array">
+ >>> x.to_xml(u"H1").write(sys.stdout) # doctest: +NORMALIZE_WHITESPACE
+ <Array Name="H1:nearestleaftree:array" Type="real_8">
<Dim>2</Dim>
<Dim>2</Dim>
<Stream Delimiter=" " Type="Local">
@@ -523,7 +523,7 @@ class HorizonHistories(dict):
500.0
>>> x.functional_integral((300., 500.))
0.0
- >>> x.functional_integral((100., 150.), lambda f: f**3)
+ >>> x["H1"].functional_integral((100., 150.), w = lambda f: f**3)
200.0
"""
if not self or not all(self.values()):
--
GitLab