Merge lp:~vivian-vdesmedt/ipython/synchronize-editor into lp:ipython/0.11

Proposed by Fernando Perez
Status: Merged
Merge reported by: Fernando Perez
Merged at revision: 1101
Proposed branch: lp:~vivian-vdesmedt/ipython/synchronize-editor
Merge into: lp:ipython/0.11
To merge this branch: bzr merge lp:~vivian-vdesmedt/ipython/synchronize-editor
To post a comment you must log in.
1075. By Fernando Perez

Merge with upstream

1076. By Fernando Perez

Adjust regexps for random tests

Revision history for this message
Fernando Perez (fdo.perez) wrote :

Mmh, I was getting ready to merge and push, but then I went and looked at the code, and I see the whole thing is written in camelCase():

http://bazaar.launchpad.net/%7Evivian-vdesmedt/ipython/synchronize-editor/annotate/1007?file_id=ipy_synchronize_with-20080612032938-lxufpyi2plzu3mlc-1

Why is that the case? For all new code, we are really trying to stick to proper PEP-8 within reason, and I don't want to violate that unless there's a good motive for it.

I also don't see any docstrings in any of the functions at all.

Vivian, I realize that this may be a bit painful, but as you can see, we're now making an honest effort at building a much higher quality codebase for IPython, so that all code that goes in is reviewed, documented and tested. And we are all living by the same rules (see recent reviews on other branches, and all the work that has gone into having testing machinery for ipython itself).

With bzr and launchpad, it's relatively easy for you to track the trunk (simply keep merging from trunk into your working branch and pushing back upstream frequently), so that your branch stays up to date, as you improve it. But I really think that we can't merge this code in until it's properly documented and it matches the naming conventions of the rest of the project.

I realize it's a bit frustrating at this point, but hopefully it's clear to you that these rules are there to ensure that as the whole project grows in a very healthy fashion. We're getting more new code coming in than any one of us can handle individually, and the only way we won't crumble under the weight is to enforce that all this new code is compliant with the rest of the project, documented and automatically tested.

1077. By Fernando Perez

Checkpoint before merging with upstream

1078. By Fernando Perez

Merge with upstream

1079. By Fernando Perez

Use updated user namespace construction API

1080. By Fernando Perez

Merge with upstream

1081. By Fernando Perez

Merge with upstream

1082. By Fernando Perez

Merge with upstream

1083. By Fernando Perez

Disable debug message

1084. By Fernando Perez

Correctly implement namespace handling. Minor cleanups.

Finally found a solution to manage the namespace where doctests are
run in conjunction with the IPython one. All tests seem to pass now
(except for an intermittent failure in one Twisted one that looks like
a race condition somewhere, since it doesn't always appear).

1085. By Fernando Perez

Reactivate completion test now that namespaces are working

1086. By Fernando Perez

Rename two tests that had identical names to distinguish them.

One of these (testExecuteFailuresEngineService_0) fails often, though
not always. I spent hours trying to debug what's going on but failed,
and it's non-deterministic.

1087. By Ville M. Vainio

ILeo: comment out format_for_leo for list (bad idea!)

1088. By Ville M. Vainio

LeoNode.last_edited

1089. By Ville M. Vainio

ILeo: LeoNode.__delitem__ and append(). Now clear() etc work

1090. By Ville M. Vainio

cd -foo jumps to dir matching 'foo' in directory history

1091. By Ville M. Vainio

use cd --foo instead of cd -foo. also cd --<TAB> works. changes.txt

1092. By Ville M. Vainio

ileo: wb.require() for handling inter-node dependencies

1093. By Ville M. Vainio

ileo: _p does not get erased with recursive ipush / wb.require()

1094. By Ville M. Vainio

ileo: call outerUpdate to update leo outline in pre_prompt_hook

1095. By Fernando Perez

Fixes to build system.

1096. By Fernando Perez

Merge with upstream

1097. By Fernando Perez

Little test file for plugin

1098. By Fernando Perez

Fixes to build/setup machinery.

Lots of changes to setup.py and doc building machinery to ensure we
get all the docs correctly built and installed at the end.

1099. By Fernando Perez

update revnum

1100. By Fernando Perez

Small updates to build tools (rpm building temporarily off)

1101. By Fernando Perez

List Ville Vainio as doc author.

Subscribers

People subscribed via source and target branches