yade-dev team mailing list archive

["Anton Gladky" <gladky.anton@xxxxxxxxx>]

The following commit has been merged in the master branch:
commit 4454d5d6c61f7a571e7bcaaa69c0cc3cf7585b4f
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Tue Apr 3 21:33:04 2012 +0200

    Small fixes due to ipython 0.12 migration.

diff --git a/debian/patches/fix_ipython_0.12.patch b/debian/patches/fix_ipython_0.12.patch
new file mode 100644
index 0000000..4144ab1
--- /dev/null
+++ b/debian/patches/fix_ipython_0.12.patch
@@ -0,0 +1,32 @@
+Description: small fixes due to ipython 0.12
+Author: Anton Gladky <gladky.anton@xxxxxxxxx>
+Applied-Upstream: https://github.com/yade/trunk/commit/307beb3c39da3e29dbd88d0b114adf05233e4e85
+Last-Update: 2012-04-03
+
+--- a/core/main/main.py.in
++++ b/core/main/main.py.in
+@@ -217,15 +217,13 @@
+ 		# http://lists.ipython.scipy.org/pipermail/ipython-user/2008-September/005839.html
+ 		import IPython.ipapi
+ 		IPython.ipapi.get().IP.atexit_operations()
+-	elif yade.runtime.ipython_version==11:
++	elif yade.runtime.ipython_version>=11:
+ 		from IPython.frontend.terminal.embed import InteractiveShellEmbed
+ 		# use the dict to set attributes
+ 		for k in ipconfig: setattr(InteractiveShellEmbed,k,ipconfig[k])
+ 		InteractiveShellEmbed.banner1=banner # called banner1 here, not banner anymore
+ 		ipshell=InteractiveShellEmbed()
+ 		ipshell()
+-		# similar to the workaround, as for 0.10 (perhaps not needed?)
+-		ipshell.atexit_operations()
+ 
+ ## run userSession in a way corresponding to the features we use:
+ gui=None
+@@ -263,5 +261,5 @@
+ 	qapp=QtGui.QApplication(sys.argv)
+ 	userSession(qt4=True,qapp=qapp)
+ 
+-#O.exitNoBacktrace()
+-
++if yade.runtime.ipython_version>=10:
++    O.exitNoBacktrace()
diff --git a/debian/patches/series b/debian/patches/series
index 0f8b3b6..0e9758f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_vtk-5.8_compilation.patch
 ipython-0.11-migration.patch
 disable_tex_creation.patch
 fix_boost_1.48_compilation.patch
+fix_ipython_0.12.patch

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.