Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 9 Nov 2015 18:27:27 +0000 (10:27 -0800)
committerW. Trevor King <wking@tremily.us>
Mon, 9 Nov 2015 18:27:27 +0000 (10:27 -0800)
commita88359c3b96f00834e517fe79a085c786cdd8e4a
treee4049ab9d4460c5939b9f42c00a793c6c38870ab
parent711664b7f65ff89af7d4fcc6023d5c424df9a555
parent74844ea43e4df102d9013eae92d19f7f924ee00b
Merge branch 'master' into namespaced

* master:
  swc-installation-test-2.py: Disable sympy, Cython, networkx, and mayavi.mlab
  swc-installation-test-2.py: Comment explaining implemention
setup/installation-test/swc-installation-test-2.py