IPython - Enhanced Interactive Python

lp:~ipython-dev/ipython/module-reorg

Created by Brian Granger on 2009-03-23 and last modified on 2009-08-13
Get this branch:
bzr branch lp:~ipython-dev/ipython/module-reorg
Members of IPython Developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
IPython Developers
Project:
IPython
Status:
Merged

Recent revisions

1253. By Brian Granger on 2009-08-13

Added to changes.txt.

1252. By Brian Granger on 2009-08-13

Removing .hgignore.

1251. By Brian Granger on 2009-08-05

Merging upstream changes from final 0.10 release.

1250. By Brian Granger on 2009-08-04

Merging -r 1201 from lp:ipython.

This concludes the upstream merge of trunk into the module-reorg branch.

1249. By Brian Granger on 2009-08-04

Merging -r 1200 from lp:ipython.

1248. By Brian Granger on 2009-08-04

Merging -r 1199 from lp:ipython.

1247. By Brian Granger on 2009-08-04

Merging -r 1198 from lp:ipython.

1246. By Brian Granger on 2009-08-04

Merging -r 1197 from lp:ipython.

1245. By Brian Granger on 2009-08-04

Merging -r 1196 from lp:ipython.

A couple of issues came up:

* Some tests in testing and frontend rely on twisted, but are being
  tested with nose. This is bad! We currently have hackish logic in
  iptest to skip these if twisted is not installed, but if it is we
  are testing them with nose!
* Some modules (engineservice, kernel/error, newserialized) have nose
  skip logic even though they should never be tested with nose.
* When trial is run on testStrictDict we get an uncaught error.

testStrictDict ... ERROR: An unexpected error occurred while tokenizing
input The following traceback may be corrupted or invalid
The error message is: ('EOF in multi-line statement', (37, 0))

1244. By Brian Granger on 2009-08-04

Merging -r 1195 from lp:ipython.x

Branch metadata

Branch format:
Branch format 6
Repository format:
Bazaar pack repository format 1 (needs bzr 0.92)
This branch contains Public information 
Everyone can see this information.

Subscribers