Merge branch 'main' into mapca-package

ME-ICA · Mar 17, 2021 · eb0047f · eb0047f
2 parents d8e7c7e + eec1a85
commit eb0047f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/tedana/reporting/data/html/report_head_template.html b/tedana/reporting/data/html/report_head_template.html
@@ -4,11 +4,11 @@
 <head>
 <title>tedana report</title>
 <meta name="viewport" content="width = device-width, initial-scale = 1" charset="UTF-8">
-<script src="https://cdn.bokeh.org/bokeh/release/bokeh-2.0.1.min.js"
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-$bokehversion.min.js"
         crossorigin="anonymous"></script>
-<script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.0.1.min.js"
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-$bokehversion.min.js"
         crossorigin="anonymous"></script>
-<script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.0.1.min.js"
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-$bokehversion.min.js"
         crossorigin="anonymous"></script>
 <link rel="stylesheet" href="https://unpkg.com/[email protected]/build/pure-min.css"
     integrity="sha384-oAOxQR6DkCoMliIh8yFnu25d7Eq/PHS21PClpwjOTeU2jRSq11vu66rf90/cZr47" crossorigin="anonymous">
@@ -35,4 +35,4 @@
 <body>
     $body
 </body>
-</html>
+</html>
diff --git a/tedana/reporting/html_report.py b/tedana/reporting/html_report.py
@@ -1,5 +1,6 @@
 import pandas as pd
 from bokeh import (embed, layouts, models)
+from bokeh import __version__ as bokehversion
 from pathlib import Path
 from os.path import join as opj
 from string import Template
@@ -50,7 +51,7 @@ def _save_as_html(body):
     with open(str(head_template_path), 'r') as head_file:
         head_tpl = Template(head_file.read())
 
-    html = head_tpl.substitute(version=__version__, body=body)
+    html = head_tpl.substitute(version=__version__, bokehversion=bokehversion, body=body)
     return html
 
 

diff --git a/tedana/tests/data/cornell_three_echo_outputs.txt b/tedana/tests/data/cornell_three_echo_outputs.txt
@@ -66,9 +66,6 @@ figures/comp_061.png
 figures/comp_062.png
 figures/comp_063.png
 figures/comp_064.png
-figures/comp_065.png
-figures/comp_066.png
-figures/comp_067.png
 dn_ts_OC.nii.gz
 feats_OC2.nii.gz
 figures