From 21d46ca4b5f43ae18d6aefc383b6ba9e286373db Mon Sep 17 00:00:00 2001
From: Patrick Godwin <patrick.godwin@ligo.org>
Date: Fri, 6 Jul 2018 10:04:55 -0700
Subject: [PATCH] fix more doctests in datasource.py, update .gitlab-ci.yml
with more python files to ignore doctests for
---
.gitlab-ci.yml | 2 +-
gstlal/python/datasource.py | 14 +++-----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fef5beb29..214c2660fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,7 +165,7 @@ test:gstlal:
script:
- apt-get install -y python-pytest
- cd gstlal
- - python -m pytest -v --doctest-modules --ignore gst/python --ignore port-tools --ignore tests --ignore python/misc.py
+ - python -m pytest -v --doctest-modules --ignore gst/python --ignore port-tools --ignore tests --ignore python/misc.py --ignore python/pipeparts/__init__.py --ignore python/matplotlibhelper.py
only:
- pushes
- schedules
diff --git a/gstlal/python/datasource.py b/gstlal/python/datasource.py
index da7bddaf60..fd223d049a 100644
--- a/gstlal/python/datasource.py
+++ b/gstlal/python/datasource.py
@@ -88,12 +88,7 @@ def channel_dict_from_channel_list_with_node_range(channel_list):
Examples:
>>> channel_dict_from_channel_list_with_node_range(["0000:0002:H1=LSC_STRAIN_1,L1=LSC_STRAIN_2", "0002:0004:H1=LSC_STRAIN_3,L1=LSC_STRAIN_4", "0004:0006:H1=LSC_STRAIN_5,L1=LSC_STRAIN_6"])
- {'0000' : {'H1': 'LSC_STRAIN_1', 'L1': 'LSC-STRAIN_2'},
- '0001' : {'H1': 'LSC_STRAIN_1', 'L1': 'LSC-STRAIN_2'},
- '0002' : {'H1': 'LSC_STRAIN_3', 'L1': 'LSC-STRAIN_4'},
- '0003' : {'H1': 'LSC_STRAIN_3', 'L1': 'LSC-STRAIN_4'},
- '0004' : {'H1': 'LSC_STRAIN_5', 'L1': 'LSC-STRAIN_6'},
- '0005' : {'H1': 'LSC_STRAIN_5', 'L1': 'LSC-STRAIN_6'} }
+ {'0004': {'H1': 'LSC_STRAIN_5', 'L1': 'LSC_STRAIN_6'}, '0005': {'H1': 'LSC_STRAIN_5', 'L1': 'LSC_STRAIN_6'}, '0000': {'H1': 'LSC_STRAIN_1', 'L1': 'LSC_STRAIN_2'}, '0001': {'H1': 'LSC_STRAIN_1', 'L1': 'LSC_STRAIN_2'}, '0002': {'H1': 'LSC_STRAIN_3', 'L1': 'LSC_STRAIN_4'}, '0003': {'H1': 'LSC_STRAIN_3', 'L1': 'LSC_STRAIN_4'}}
"""
outdict = {}
for instrument_channel_full in channel_list:
@@ -180,11 +175,8 @@ def injection_dict_from_channel_list_with_node_range(injection_list):
specify the "append" action.
Examples:
- >>> injection_dict_from_channel_list_with_node_range(["0000:0002:Injection_1.xml", "0002:0004:Injection_2.xml"])
- {'0000' : 'Injection_1.xml',
- '0001' : 'Injection_1.xml',
- '0002' : 'Injection_2.xml',
- '0003' : 'Injection_2.xml'}
+ >>> injection_dict_from_channel_list_with_node_range(["0000:0002:Injection_1.xml", "0002:0004:Injection_2.xml"])
+{'0000': 'Injection_1.xml', '0001': 'Injection_1.xml', '0002': 'Injection_2.xml', '0003': 'Injection_2.xml'}
"""
outdict = {}
for injection_name in injection_list:
--
GitLab