Changeset 2499

Timestamp:

05/11/12 15:25:52 (12 years ago)

Author:

Malte Marquarding

Message:

use ipython >=0.11

Location:

trunk

Files:

• bin/asap (modified) (2 diffs)
• packaging/setup.py (modified) (1 diff)
• python/env.py (modified) (1 diff)
• python/ipysupport.py (modified) (1 diff)

trunk/bin/asap

@@ -1 +1 @@
 #!/usr/bin/env python
 import os
-from asap import *
 
 def main():
@@ -25 +24 @@
     os.system('clear')
     import IPython
+    from asap import *
     main()
 except ImportError:
     print "No ipython found. Running standard python"
+    from asap import *

trunk/packaging/setup.py

@@ -20 +20 @@
 ''',
       packages = find_packages(),
-      install_requires = ["ipython<=0.10", "matplotlib>=0.99", "numpy>=1.3"],
+      install_requires = ["ipython>=0.11", "matplotlib>=0.99", "numpy>=1.3"],
       package_data = {"": ["_asap.so", "data/ipy*"],
                       },
-      scripts = ["bin/asap", "bin/asap2to3", "bin/asap_update_data"],
+      scripts = ["bin/asap", "bin/asap_update_data"],
       license = 'GPL',
       zip_safe = 0,

trunk/python/env.py

@@ -51 +51 @@
             not os.path.exists(os.environ["CASAPATH"].split()[0]+"/data"):
         os.environ["CASAPATH"] = "%s %s somwhere" % ( asapdata, plf)
+
     # set up user space
-    userdir = os.environ["HOME"]+"/.asap"
-    if not os.path.exists(userdir):
-        print 'First time ASAP use. Setting up ~/.asap'
-        os.mkdir(userdir)
-        if not is_casapy():
-            shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
-                            userdir+"/ipy_user_conf.py")
-        f = file(userdir+"/asapuserfuncs.py", "w")
-        f.close()
-        f = file(userdir+"/ipythonrc", "w")
-        f.close()
-    else:
-        if not is_casapy():
-            # upgrade to support later ipython versions
-            if not os.path.exists(userdir+"/ipy_user_conf.py"):
-               shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
-                               userdir+"/ipy_user_conf.py")
+#     userdir = os.environ["HOME"]+"/.asap"
+#     if not os.path.exists(userdir):
+#         print 'First time ASAP use. Setting up ~/.asap'
+#         os.makedirs(os.path.join(userdir, "profile_default"))
+#         if not is_casapy():
+#             shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
+#                             userdir+"/ipy_user_conf.py")
+#             shutil.copyfile(asapdata+"/data/ipython_config.py",
+#                             userdir+"/profile_default/ipython_config.py")
+#         f = file(userdir+"/asapuserfuncs.py", "w")
+#         f.close()
+#         f = file(userdir+"/ipythonrc", "w")
+#         f.close()
+#     else:
+#         if not is_casapy():
+#             # upgrade to support later ipython versions
+            
+#             if not os.path.exists(userdir+"/ipy_user_conf.py"):
+#                shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
+#                                userdir+"/ipy_user_conf.py")
+#             if not os.path.exists(userdir+"/profile_default/ipython_config.py"):
+#                shutil.copyfile(asapdata+"/data/ipython_config.py",
+#                                userdir+"/profile_default/ipython_config.py")
+
 
 def get_revision():

trunk/python/ipysupport.py

@@ -7 +7 @@
 
 # workaround for ipython, which redirects this if banner=0 in ipythonrc
-sys.stdout = sys.__stdout__
-sys.stderr = sys.__stderr__
+#sys.stdout = sys.__stdout__
+#sys.stderr = sys.__stderr__
 
 def version():