Adjusted nd-vmsetupwizard to install all ipython components + skimage and statsmodels...

diff --git a/debian/TODO b/debian/TODO
index 0d57215b2a92b833694dab8ba4d865ea3d27ffb2..4e73550e98937ccffbb43a3d444d2a8a2849938f 100644 (file)
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,2 +1,5 @@
 * make ARCHS argument for cmdsettings.sh to be used by the tools so we could build on sparcs etc
 * add ipython-notebook/qtconsole (and probably ipython1x over ipython01x for >= wheezy) to welcomewizard
+
+  would need to assure that mvpa2-tutorial is aware of ipython1x first
+  then... not now

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index 1ab3e4b0dddb7daa4b674d7c63124c1923f55c51..7afc31367f809af740dd8e5542e2b9802e3ae933 100755 (executable)
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -108,7 +108,7 @@ fi
 
 # Figure out which version of IPython is available
 ipython_version=$(apt-cache policy ipython 2>/dev/null | sed -ne '/Version table:/ { n;s,^[ \*]*\(.*\) .*,\1,gp}')
-dpkg --compare-versions $ipython_version lt 0.13.1 && ipython=ipython01x || ipython=ipython
+dpkg --compare-versions $ipython_version lt 0.13.1 && ipython=ipython01x || ipython=ipython,ipython-notebook,ipython-qtconsole
 
 # TODO: add PyMVPA:
 #   FALSE "PyMVPA" "python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorial-data" \
@@ -127,7 +127,7 @@ FALSE "OpenOffice.org" "openoffice.org" \
 FALSE "PyMVPA Tutorial" "$ipython,python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorialdata,spyder" \
 FALSE "Python: Electrophysiology & Modeling" "python-brian,python-pynn,python-pyentropy,stimfit" \
 FALSE "Python: Neuroimaging" "$ipython,spyder,nipy-suite,python-mvpa2" \
-FALSE "Python: Scientific stack" "$ipython,spyder,python-matplotlib,python-pandas,python-sympy" \
+FALSE "Python: Scientific stack" "$ipython,spyder,python-matplotlib,python-pandas,python-sympy,python-statsmodels,python-skimage" \
 FALSE "R" "r-recommended" \
 FALSE "TeX Live" "texlive" \
 FALSE "Adobe Flash browser plugin" "flashplugin-nonfree" \