Merge pull request #1115 from UV-CDAT/fix_broken_deps_spyder

doutriaux1 · doutriaux1 · commit 77a3cc85e8a5 · 2015-03-04T17:22:27.000-08:00
adding ipython created cyclical deps
diff --git a/CMake/cdat_modules/spyder_deps.cmake b/CMake/cdat_modules/spyder_deps.cmake
@@ -1 +1 @@
-set(spyder_deps ${pyzmq_pkg} ${pyqt_pkg} ${python_pkg} ${pip_pkg} ${numpy_pkg} ${scipy_pkg} ${sphinx_pkg} ${ipython_pkg} ${matplotlib_pkg})
+set(spyder_deps ${pyzmq_pkg} ${pyqt_pkg} ${python_pkg} ${pip_pkg} ${numpy_pkg} ${scipy_pkg} ${sphinx_pkg} ${matplotlib_pkg})

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-set(spyder_deps ${pyzmq_pkg} ${pyqt_pkg} ${python_pkg} ${pip_pkg} ${numpy_pkg} ${scipy_pkg} ${sphinx_pkg} ${ipython_pkg} ${matplotlib_pkg})`
	`1`	`+set(spyder_deps ${pyzmq_pkg} ${pyqt_pkg} ${python_pkg} ${pip_pkg} ${numpy_pkg} ${scipy_pkg} ${sphinx_pkg} ${matplotlib_pkg})`