Created by Brian Granger on 2008-09-04 and last modified on 2010-02-22

This branch is used by Brian Granger for his main IPython development. It continually merged into ipython trunk.

Get this branch:
bzr branch lp:~ellisonbg/ipython/trunk-dev
Only Brian Granger can upload to this branch. If you are Brian Granger please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Brian Granger

Recent revisions

1187. By Brian Granger on 2010-02-22

Fixed foolscap imports.

As of Foolscap 0.4.3, foolscap introduces a foolscap.api module
that all top-level symbols must be imported from.

Fixes https://bugs.launchpad.net/ipython/+bug/525805

1186. By Brian Granger on 2010-02-22

Improved Monte-Carlo options pricing example.

1185. By Brian Granger on 2010-02-01

Fixed bugs in IPython.kernel.

* Removed :mod:`IPython.kernel.contexts` and
  :mod:`IPython.kernel.tests.test_contexts` and all code that used them. This
  was broken and needed to be removed. Also Enthought has a nice decorator
  that does this. * Fixed broken tests in :file:`test_multienginefc.py` and
  :file:`test_taskfc.py`. See https://bugs.launchpad.net/ipython/+bug/505358.
* Changed ports number in :mod:`IPython.kernel.tests` to 10111 to avoid
  conflicts with users who are using the older 10105 ports. See
* Fixed logic and bugs in :mod:`IPython.kernel.fcutils` and
  :mod:`IPython.kernel.clientconnector` related to how FURL files are
  validated and found. See https://bugs.launchpad.net/ipython/+bug/502790.
* Fixed the unhandled :class:`DeadReferenceError`` exception that was happening
  in :mod:`IPython.kernel.multiengineclient' and :mod:`IPython.kernel.taskclient`
  when the controller died or restarted. Now we capture that error
  and raises a :class:`IPython.kernel.error.ConnectionError` that has a
  better error message. See https://bugs.launchpad.net/ipython/+bug/502796.

1184. By Brian Granger on 2010-01-31

Merging from upstream trunk.

1183. By Brian Granger on 2009-03-23

Merging latest trunk.

I got a criss-cross merge in this and did merge --weave. Hope this is

1182. By Brian Granger on 2009-03-18

The ipcluster command is now able to reuse FURL files.

This is done by passing the -r, --client-port and --engine-port options
onto ipcontroller. Docs are also updated to indicated this new feature.

1181. By Brian Granger on 2009-03-18

Changing references to mpirun to mpiexec in docs.

1180. By Brian Granger on 2009-03-18

Removing unneeded log.msg in ipcluster.py

1179. By Brian Granger on 2009-03-18

Adding support for mpiexec as well as mpirun.

The mpiexec command is the preferred way of starting MPI jobs. We also
support mpirun for backwards compatiblity.

1178. By Brian Granger on 2009-03-18

Adding documentation to the new benchmark method of MultiEngineClient.

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.