Changeset 2621

Timestamp:

08/06/12 12:15:11 (12 years ago)

Author:

Malte Marquarding

Message:

allow for ipython >=0.10 (both 0.10 and 0.11)

Location:

trunk

Files:

• bin/asap (modified) (3 diffs)
• python/env.py (modified) (1 diff)
• setup.py (modified) (1 diff)

trunk/bin/asap

@@ -2 +2 @@
 import os
 
-def main():
+def main10():
+    from IPython.Shell import IPShellEmbed
+
+    banner = "HELLO"
+    exit_msg = "bye"
+    
+    ipshell = IPShellEmbed(sys.argv[1:],banner,exit_msg)
+    return ipshell
+
+
+def main11():
     from IPython.config.loader import Config
     cfg = Config()
@@ -19 +29 @@
                                     banner1 = welcome(),
                                     exit_msg = '')
-    ipshell()
+    return ipshell
 
 try: 
@@ -25 +35 @@
     import IPython
     from asap import *
-    main()
+    vers = int(IPython.__version__.split(".")[1])
+    if vers >= 11:
+        ipshell = main11()
+    else:
+        ipshell = main10()
+
 except ImportError:
-    print "No ipython found. Running standard python"
+    banner =  "No ipython found. Running standard python"
+    import code
     from asap import *
+    del main
+    code.interact(banner, local=locals())

trunk/python/env.py

@@ -53 +53 @@
 
     # set up user space
-#     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 os.environ["USER"] == 'root':
+        return
+    try:
+        import IPython
+          # 0.11+ doesn't use user dir
+        if int(IPython.__version__.split(".")[1]) >= 11:
+            return
+    except:
+        # no ipython so we don't need user dir
+        return
+    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+"/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",

trunk/setup.py

@@ -17 +17 @@
       scripts = ["bin/asap", "bin/asap_update_data",],
       license = 'GPL',
-      install_requires = ["ipython>=0.11", "matplotlib>=0.99", "numpy>=1.3"],
+      install_requires = ["ipython>=0.10", "matplotlib>=0.99", "numpy>=1.3"],
 #      setup_requires = [ "scons>=1.0" ],
       )