Merge pull request #21 from cmmorrow/BUGFIX-Future_warning_displayed_…

…for_dictionary_xdata Bugfix future warning displayed for dictionary xdata
cmmorrow · May 27, 2018 · ec7600e · ec7600e
2 parents 1123f52 + 0503766
commit ec7600e
Show file tree

Hide file tree

Showing 75 changed files with 3,973 additions and 1,165 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,10 @@ build_distro.sh
 setup.cfg.old
 .DS_Store
 .cache/v/cache/lastfailed
+docs/.ipynb_checkpoints/sci_analysis_main-checkpoint.ipynb
+build_docs.sh
+build_docs.sh
+build_docs.sh
+docs/index.rst.bak
+docs/_build/*
+docs/_build/html/_static/classic.css
diff --git a/README.rst b/README.rst
diff --git a/build_docs.sh b/build_docs.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+com=$HOME/sci_analysis_qa_env/bin/jupyter
+docs=./docs
+images=./img
+index=sci_analysis_main
+notebook=${docs}/${index}.ipynb
+output=${docs}/index.md
+output_backup=${output}.bak
+if [ -f ${output} ]; then
+    mv ${output} ${output_backup}
+fi
+${com} nbconvert --to markdown NbConvertApp.output_base=${docs} --NbConvertApp.output_files_dir=${images} ${notebook}
+mv ${docs}/${index}.md ${output}
+sed -i -e "s/> Note:/.. note::/g" ${output}
+sed -i -e "s/.*warnings.*//" ${output}
+make -C ${docs} html
+rm ${docs}/*-e
+
+exit 0
diff --git a/docs/conf.py b/docs/conf.py
@@ -36,6 +36,7 @@
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.pngmath',
+    'm2r',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/img/histo1_2.png → docs/img/sci_analysis_main_18_0.png b/img/histo1_2.png → docs/img/sci_analysis_main_18_0.png
diff --git a/docs/img/sci_analysis_main_19_0.png b/docs/img/sci_analysis_main_19_0.png
diff --git a/img/cat1.png → docs/img/sci_analysis_main_20_0.png b/img/cat1.png → docs/img/sci_analysis_main_20_0.png
diff --git a/docs/img/sci_analysis_main_21_0.png b/docs/img/sci_analysis_main_21_0.png
diff --git a/img/corr1_2.png → docs/img/sci_analysis_main_24_0.png b/img/corr1_2.png → docs/img/sci_analysis_main_24_0.png
diff --git a/docs/img/sci_analysis_main_25_0.png b/docs/img/sci_analysis_main_25_0.png
diff --git a/img/comp4_2.png → docs/img/sci_analysis_main_26_1.png b/img/comp4_2.png → docs/img/sci_analysis_main_26_1.png
diff --git a/docs/img/sci_analysis_main_27_0.png b/docs/img/sci_analysis_main_27_0.png
diff --git a/docs/img/sci_analysis_main_27_1.png b/docs/img/sci_analysis_main_27_1.png
diff --git a/img/comp5_2.png → docs/img/sci_analysis_main_28_1.png b/img/comp5_2.png → docs/img/sci_analysis_main_28_1.png
diff --git a/docs/img/sci_analysis_main_29_0.png b/docs/img/sci_analysis_main_29_0.png
diff --git a/docs/img/sci_analysis_main_29_1.png b/docs/img/sci_analysis_main_29_1.png
diff --git a/img/comp6_2.png → docs/img/sci_analysis_main_30_1.png b/img/comp6_2.png → docs/img/sci_analysis_main_30_1.png
diff --git a/docs/img/sci_analysis_main_31_0.png b/docs/img/sci_analysis_main_31_0.png
diff --git a/docs/img/sci_analysis_main_31_1.png b/docs/img/sci_analysis_main_31_1.png
diff --git a/img/histo2_2.png → docs/img/sci_analysis_main_36_0.png b/img/histo2_2.png → docs/img/sci_analysis_main_36_0.png
diff --git a/docs/img/sci_analysis_main_37_0.png b/docs/img/sci_analysis_main_37_0.png
diff --git a/img/corr2_2.png → docs/img/sci_analysis_main_38_0.png b/img/corr2_2.png → docs/img/sci_analysis_main_38_0.png
diff --git a/docs/img/sci_analysis_main_39_0.png b/docs/img/sci_analysis_main_39_0.png
diff --git a/docs/img/sci_analysis_main_40_0.png b/docs/img/sci_analysis_main_40_0.png
diff --git a/docs/img/sci_analysis_main_41_0.png b/docs/img/sci_analysis_main_41_0.png
diff --git a/img/corr3_2.png → docs/img/sci_analysis_main_42_0.png b/img/corr3_2.png → docs/img/sci_analysis_main_42_0.png
diff --git a/docs/img/sci_analysis_main_43_0.png b/docs/img/sci_analysis_main_43_0.png
diff --git a/img/corr4_2.png → docs/img/sci_analysis_main_44_0.png b/img/corr4_2.png → docs/img/sci_analysis_main_44_0.png
diff --git a/docs/img/sci_analysis_main_45_0.png b/docs/img/sci_analysis_main_45_0.png
diff --git a/img/comp1_2.png → docs/img/sci_analysis_main_46_0.png b/img/comp1_2.png → docs/img/sci_analysis_main_46_0.png
diff --git a/docs/img/sci_analysis_main_47_0.png b/docs/img/sci_analysis_main_47_0.png
diff --git a/img/comp2_2.png → docs/img/sci_analysis_main_48_1.png b/img/comp2_2.png → docs/img/sci_analysis_main_48_1.png
diff --git a/docs/img/sci_analysis_main_49_0.png b/docs/img/sci_analysis_main_49_0.png
diff --git a/docs/img/sci_analysis_main_49_1.png b/docs/img/sci_analysis_main_49_1.png
diff --git a/docs/img/sci_analysis_main_50_1.png b/docs/img/sci_analysis_main_50_1.png
diff --git a/docs/img/sci_analysis_main_51_0.png b/docs/img/sci_analysis_main_51_0.png
diff --git a/docs/img/sci_analysis_main_51_1.png b/docs/img/sci_analysis_main_51_1.png
diff --git a/img/comp3_2.png → docs/img/sci_analysis_main_54_1.png b/img/comp3_2.png → docs/img/sci_analysis_main_54_1.png
diff --git a/docs/img/sci_analysis_main_55_0.png b/docs/img/sci_analysis_main_55_0.png
diff --git a/docs/img/sci_analysis_main_55_1.png b/docs/img/sci_analysis_main_55_1.png