##// END OF EJS Templates
Merge pull request #12875 from Carreau/auto-backport-of-pr-12874-on-7.x...
Matthias Bussonnier -
r26407:a50f9458 merge
parent child Browse files
Show More
@@ -123,94 +123,101 b' ZeroDivisionError Traceback (most recent call last)'
123 ZeroDivisionError: ...
123 ZeroDivisionError: ...
124 """
124 """
125
125
126 def doctest_tb_sysexit():
126 # TODO : Marc 2021 – this seem to fail due
127 """
127 # to upstream changes in CI for whatever reason.
128 In [17]: %xmode plain
128 # Commenting for now, to revive someday (maybe?)
129 Exception reporting mode: Plain
129 # nose won't work in 3.10 anyway and we'll have to disable iptest.
130
130 # thus this likely need to bemigrated to pytest.
131 In [18]: %run simpleerr.py exit
131
132 An exception has occurred, use %tb to see the full traceback.
132 # warning this test differs between 7.x and 8+ branch.
133 SystemExit: (1, 'Mode = exit')
133
134
134 # def doctest_tb_sysexit():
135 In [19]: %run simpleerr.py exit 2
135 # """
136 An exception has occurred, use %tb to see the full traceback.
136 # In [17]: %xmode plain
137 SystemExit: (2, 'Mode = exit')
137 # Exception reporting mode: Plain
138
138 #
139 In [20]: %tb
139 # In [18]: %run simpleerr.py exit
140 Traceback (most recent call last):
140 # An exception has occurred, use %tb to see the full traceback.
141 File ... in <module>
141 # SystemExit: (1, 'Mode = exit')
142 bar(mode)
142 #
143 File ... line 22, in bar
143 # In [19]: %run simpleerr.py exit 2
144 sysexit(stat, mode)
144 # An exception has occurred, use %tb to see the full traceback.
145 File ... line 11, in sysexit
145 # SystemExit: (2, 'Mode = exit')
146 raise SystemExit(stat, 'Mode = %s' % mode)
146 #
147 SystemExit: (2, 'Mode = exit')
147 # In [20]: %tb
148
148 # Traceback (most recent call last):
149 In [21]: %xmode context
149 # File ... in <module>
150 Exception reporting mode: Context
150 # bar(mode)
151
151 # File ... line 22, in bar
152 In [22]: %tb
152 # sysexit(stat, mode)
153 ---------------------------------------------------------------------------
153 # File ... line 11, in sysexit
154 SystemExit Traceback (most recent call last)
154 # raise SystemExit(stat, 'Mode = %s' % mode)
155 <BLANKLINE>
155 # SystemExit: (2, 'Mode = exit')
156 ...<module>
156 #
157 30 mode = 'div'
157 # In [21]: %xmode context
158 31
158 # Exception reporting mode: Context
159 ---> 32 bar(mode)
159 #
160 <BLANKLINE>
160 # In [22]: %tb
161 ...bar(mode)
161 # ---------------------------------------------------------------------------
162 20 except:
162 # SystemExit Traceback (most recent call last)
163 21 stat = 1
163 # <BLANKLINE>
164 ---> 22 sysexit(stat, mode)
164 # ...<module>
165 23 else:
165 # 30 mode = 'div'
166 24 raise ValueError('Unknown mode')
166 # 31
167 <BLANKLINE>
167 # ---> 32 bar(mode)
168 ...sysexit(stat, mode)
168 # <BLANKLINE>
169 9
169 # ...bar(mode)
170 10 def sysexit(stat, mode):
170 # 20 except:
171 ---> 11 raise SystemExit(stat, 'Mode = %s' % mode)
171 # 21 stat = 1
172 12
172 # ---> 22 sysexit(stat, mode)
173 13 def bar(mode):
173 # 23 else:
174 <BLANKLINE>
174 # 24 raise ValueError('Unknown mode')
175 SystemExit: (2, 'Mode = exit')
175 # <BLANKLINE>
176
176 # ...sysexit(stat, mode)
177 In [23]: %xmode verbose
177 # 9
178 Exception reporting mode: Verbose
178 # 10 def sysexit(stat, mode):
179
179 # ---> 11 raise SystemExit(stat, 'Mode = %s' % mode)
180 In [24]: %tb
180 # 12
181 ---------------------------------------------------------------------------
181 # 13 def bar(mode):
182 SystemExit Traceback (most recent call last)
182 # <BLANKLINE>
183 <BLANKLINE>
183 # SystemExit: (2, 'Mode = exit')
184 ... in <module>
184 #
185 30 mode = 'div'
185 # In [23]: %xmode verbose
186 31
186 # Exception reporting mode: Verbose
187 ---> 32 bar(mode)
187 #
188 global bar = <function bar at ...>
188 # In [24]: %tb
189 global mode = 'exit'
189 # ---------------------------------------------------------------------------
190 <BLANKLINE>
190 # SystemExit Traceback (most recent call last)
191 ... in bar(mode='exit')
191 # <BLANKLINE>
192 20 except:
192 # ... in <module>
193 21 stat = 1
193 # 30 mode = 'div'
194 ---> 22 sysexit(stat, mode)
194 # 31
195 global sysexit = <function sysexit at ...>
195 # ---> 32 bar(mode)
196 stat = 2
196 # global bar = <function bar at ...>
197 mode = 'exit'
197 # global mode = 'exit'
198 23 else:
198 # <BLANKLINE>
199 24 raise ValueError('Unknown mode')
199 # ... in bar(mode='exit')
200 <BLANKLINE>
200 # 20 except:
201 ... in sysexit(stat=2, mode='exit')
201 # 21 stat = 1
202 9
202 # ---> 22 sysexit(stat, mode)
203 10 def sysexit(stat, mode):
203 # global sysexit = <function sysexit at ...>
204 ---> 11 raise SystemExit(stat, 'Mode = %s' % mode)
204 # stat = 2
205 global SystemExit = undefined
205 # mode = 'exit'
206 stat = 2
206 # 23 else:
207 mode = 'exit'
207 # 24 raise ValueError('Unknown mode')
208 12
208 # <BLANKLINE>
209 13 def bar(mode):
209 # ... in sysexit(stat=2, mode='exit')
210 <BLANKLINE>
210 # 9
211 SystemExit: (2, 'Mode = exit')
211 # 10 def sysexit(stat, mode):
212 """
212 # ---> 11 raise SystemExit(stat, 'Mode = %s' % mode)
213
213 # global SystemExit = undefined
214 # stat = 2
215 # mode = 'exit'
216 # 12
217 # 13 def bar(mode):
218 # <BLANKLINE>
219 # SystemExit: (2, 'Mode = exit')
220 # """
214
221
215 def test_run_cell():
222 def test_run_cell():
216 import textwrap
223 import textwrap
@@ -7,6 +7,16 b''
7 IPython 7.22
7 IPython 7.22
8 ============
8 ============
9
9
10 Second release of IPython for 2021, mostly containing bug fixes. Here is a quick
11 rundown of the few changes.
12
13 - Fix some ``sys.excepthook`` shenanigan when embedding with qt, recommended if
14 you – for example – use `napari <https://napari.org>`__. :ghpull:`12842`.
15 - Fix bug when using the new ipdb ``%context`` magic :ghpull:`12844`
16 - Couples of deprecation cleanup :ghpull:`12868`
17 - Update for new dpast.com api if you use the ``%pastbin`` magic. :ghpull:`12712`
18 - Remove support for numpy before 1.16. :ghpull:`12836`
19
10
20
11 Thanks
21 Thanks
12 ------
22 ------
@@ -18,7 +28,7 b" codebase; they now have triage permissions to the IPython repository and we'll"
18 work toward giving them more permission in the future.
28 work toward giving them more permission in the future.
19
29
20 Many thanks to all the contributors to this release you can find all individual
30 Many thanks to all the contributors to this release you can find all individual
21 contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/XX>`__.
31 contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/84>`__.
22
32
23 Thanks as well to organisations, QuantStack for working on debugger
33 Thanks as well to organisations, QuantStack for working on debugger
24 compatibility for Xeus_python, and the `D. E. Shaw group
34 compatibility for Xeus_python, and the `D. E. Shaw group
General Comments 0
You need to be logged in to leave comments. Login now