X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Fcone%2Fall.py;h=d6a6dd6a802939e41a77ee4ab2f4449b0482d50f;hb=9e7945f39b71d26df4e8d50332a7d8606447c822;hp=c8957a0ee58f704d71ffb6cc4283893c78073d82;hpb=fe4fd66dcec165e2d0a7740890ab5560fe68d318;p=sage.d.git

diff --git a/mjo/cone/all.py b/mjo/cone/all.py
index c8957a0..d6a6dd6 100644
--- a/mjo/cone/all.py
+++ b/mjo/cone/all.py
@@ -2,15 +2,13 @@
 All imports from mjo.cone modules.
 """
 
-# Sage doesn't load ~/.sage/init.sage during testing (sage -t), so we
-# have to explicitly mangle our sitedir here so that "mjo.foo" resolves.
-from os.path import abspath
-from site import addsitedir
-addsitedir(abspath('../../'))
-
 from mjo.cone.cone import *
 from mjo.cone.completely_positive import *
 from mjo.cone.doubly_nonnegative import *
+from mjo.cone.faces import *
+from mjo.cone.nonnegative_orthant import *
 from mjo.cone.permutation_invariant import *
 from mjo.cone.rearrangement import *
+from mjo.cone.schur import *
 from mjo.cone.symmetric_psd import *
+from mjo.cone.trivial_cone import *