Skip to content
This repository

took a crack at making notebook.html extend layout.html #1278

Closed
wants to merge 42 commits into from

5 participants

hhuuggoo Brian E. Granger Fernando Perez Min RK Thomas Kluyver
hhuuggoo

It did involve shuffling a bit of the contents in the header block, as well as a main_app block to layout.html, so I don't know if this is acceptable or not.

and others added some commits
Brian E. Granger Initial work to add Wijmo based menu. 813d390
Brian E. Granger Removing old directory. e075f09
Brian E. Granger Implemented menu based UI using Wijmo. f5bcb68
Brian E. Granger Cleaning up menu code.
* QuickHelp button has been removed in favor of a Help menu item.
* Keyboard shortcuts are now in the menus.
* Numerous fixes to subtle aspects of the wijmenu implementation.
a178e6e
Brian E. Granger Improved notebook renaming.
There is not a rename dialog that is available in the File menu and
when you click on the notebook name.
098a37f
Brian E. Granger Beginning work on notebook duplication. 4103005
Brian E. Granger Finishing work on "Make a Copy" functionality. baad1b9
Brian E. Granger Minor fixes to the menu shortcuts. fe3a6c4
Brian E. Granger Removing old wijmo themes. def8269
Brian E. Granger Adding jquery base theme. c000f0b
Brian E. Granger Removing old jquery. 344a0df
Brian E. Granger Removing old jqueryui. 8d87e23
Brian E. Granger Adding dev version of jquery-ui. 406bcc2
Brian E. Granger Adding latest jquery. 1681e36
Brian E. Granger Solid first go at jquery-ui based menus. 8ae049e
Brian E. Granger Minor style changes. Using better fonts, indenting menu items. c1ab632
Brian E. Granger More minor theme/styling changes. 096f072
Brian E. Granger Remove Rename dialog from the DOM upon closing it. d401727
Brian E. Granger Fixing bug in dialog closing, drafting print css. e77516b
Brian E. Granger Improving the save notification.
* Added last saved with time/date display.
* Reimplemented save widget status updates.
25301e0
Brian E. Granger Created new print view for notebook printing. c7352db
Brian E. Granger Fixing minor things in the printing. 01e915f
Brian E. Granger Fixing docstring in the notebook manager. c29ee28
Brian E. Granger Minor fixes to the css for print view. 8ca5592
Brian E. Granger Added cell level cut/copy/paste. d10550f
Brian E. Granger Adding keyboard sortcuts for cut/copy/paste. 88738d0
Fernando Perez Merge pull request #1229 from takluyver/i1225
Fix display of SyntaxError in Python 3, plus various cleanups to exception-handling machinery.

Closes #1225.
3782b5c
Min RK kernel heartbeat does not share zmq context with rest of the app
This prevents the heartbeat from ever waiting for the GIL, which
could cause erroneous heartbeat failures.
ad971e3
Min RK add test notebook and script for #1260 (GIL-related heartbeat failures)
per #1127
7e81bf6
Thomas Kluyver Fix syntax for Python 2.6 - no set literals. a8dc95a
Min RK fix null comparisons in sqlitedb backend
associated test added and passing
ec3188c
Min RK parallel heart also gets its own Context 6c32815
Min RK Merge pull request #1262 from minrk/hbgil
Heartbeat no longer shares the app's Context

Fixes in both the single and parallel kernels, preventing the heartbeat thread from sharing the zmq Context with the rest of the process.  Non-copying sends require grabbing the GIL from the zmq io-thread in order to free memory, which could let Python get in the way of the heartbeat.

Test script and notebook added to examples directory.

closes #1260
1c4daed
Min RK match log format in Scheduler to rest of parallel apps 05f49f2
Min RK add NoDB for non-recording Hub
When used, this disables database-based actions in the Hub.

Useful for minimizing Hub memory consumption.
1aaad01
Min RK Merge pull request #1253 from ivanov/profile_auto_create
set auto_create flag for notebook apps

Fixes first use of bundled profiles when used with the notebook (e.g. ipython --profile=sympy).
9bb4034
Min RK document TaskScheduler.hwm behavior 7c46401
Min RK Merge pull request #1257 from minrk/kmclass
use self.kernel_manager_class in qtconsoleapp

Subclasses of QtConsoleApp can now override kernel_manager_class with their own version.
5d833ca
Min RK Merge pull request #1222 from minrk/mapreference
allow Reference as callable in map/apply

This allows behaviors like:

    rf = parallel.Reference('f')
    ar = view.map(rf, *sequences)

where the function 'f' is defined on the engines, and can even be different.
5608bfe
Min RK Merge pull request #1267 from minrk/nodb
add `--nodb` option for non-recording Hub

This allows simple use cases to avoid needing to call `purge_results` to prevent memory growth of the Hub.
80c3873
Min RK Merge pull request #1213 from punchagan/minor-typo
Fix minor typo in history_console_widget.py
9e5238d
Min RK
Owner

@ellisonbg can you explain this commit? It's causing problems for launchpad, since they can't handle submodules. However, this location is not part of IPython either before or after this commit, so it appears to have had exactly no effect other than breaking something in launchpad. Were you using submodules locally that were not actually part of trunk?

Owner

See the lp import page for the relevant error messages. We are going to have to rebase IPython to remove this commit (which probably never should have happened) if we want IPython to be importable in bzr for at least the next few months before submodule support is added, even though we never actually had any submodules. As I understand it, this would be necessary for @juliantaylor's nightly ppa.

/cc @fperez

Owner

Nasty, I wonder what's wrong with that commit: if I check out the parent 813d390, the subdirectory with codemirror2/ looks perfectly normal.

I don't understand why the commit shows up with that strange message -Subproject commit 3b731bb8c16efc8cb82b9f28a9ed91428d71a703...

In any case, if we need to do a rebase, the sooner the better... But we should announce it on-list so everyone knows what's going on.

Owner

'Subproject commit' means it's a submodule. The parent introduced it, and this fix should have been applied with a 'fixup', rather than allowing the original commit to stand.

Owner
Owner
Owner

Should I do the rebase and force push? It's trivial to do, and I've pushed the result to my newmaster branch, which shows an empty diff with master.

Owner
Owner

Ones created since the last bad commit ('absolute imports' and after) will probably need a rebase, but I can't be sure. I'll go ahead, and notify the list.

Owner
Brian E. Granger
Owner

Great, I will have a look at this.

Fernando Perez
Owner

@hhuuggoo, there's a problem with this PR: it's showing a huge list of unrelated commits, most likely because you merged from origin/master. Please make a separate branch in your own repo that only shows the changes you want us to review, in this case your commit above. We can then see those changes in isolation, discuss them and merge them once everything is OK. But in its current form it can't even be reviewed.

hhuuggoo hhuuggoo closed this
hhuuggoo

sure, sorry about that, I'm not sure what happened, I thought I had started with a fresh fork. let me do it again.

Fernando Perez
Owner

Hi everyone, this has been moved to #1299 with a clean branch, we can continue there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 42 unique commits by 5 authors.

Jan 12, 2012
Brian E. Granger Initial work to add Wijmo based menu. 813d390
Brian E. Granger Removing old directory. e075f09
Brian E. Granger Implemented menu based UI using Wijmo. f5bcb68
Brian E. Granger Cleaning up menu code.
* QuickHelp button has been removed in favor of a Help menu item.
* Keyboard shortcuts are now in the menus.
* Numerous fixes to subtle aspects of the wijmenu implementation.
a178e6e
Brian E. Granger Improved notebook renaming.
There is not a rename dialog that is available in the File menu and
when you click on the notebook name.
098a37f
Brian E. Granger Beginning work on notebook duplication. 4103005
Brian E. Granger Finishing work on "Make a Copy" functionality. baad1b9
Brian E. Granger Minor fixes to the menu shortcuts. fe3a6c4
Brian E. Granger Removing old wijmo themes. def8269
Brian E. Granger Adding jquery base theme. c000f0b
Brian E. Granger Removing old jquery. 344a0df
Brian E. Granger Removing old jqueryui. 8d87e23
Brian E. Granger Adding dev version of jquery-ui. 406bcc2
Brian E. Granger Adding latest jquery. 1681e36
Brian E. Granger Solid first go at jquery-ui based menus. 8ae049e
Brian E. Granger Minor style changes. Using better fonts, indenting menu items. c1ab632
Brian E. Granger More minor theme/styling changes. 096f072
Brian E. Granger Remove Rename dialog from the DOM upon closing it. d401727
Brian E. Granger Fixing bug in dialog closing, drafting print css. e77516b
Brian E. Granger Improving the save notification.
* Added last saved with time/date display.
* Reimplemented save widget status updates.
25301e0
Brian E. Granger Created new print view for notebook printing. c7352db
Brian E. Granger Fixing minor things in the printing. 01e915f
Brian E. Granger Fixing docstring in the notebook manager. c29ee28
Brian E. Granger Minor fixes to the css for print view. 8ca5592
Brian E. Granger Added cell level cut/copy/paste. d10550f
Brian E. Granger Adding keyboard sortcuts for cut/copy/paste. 88738d0
Fernando Perez Merge pull request #1229 from takluyver/i1225
Fix display of SyntaxError in Python 3, plus various cleanups to exception-handling machinery.

Closes #1225.
3782b5c
Min RK kernel heartbeat does not share zmq context with rest of the app
This prevents the heartbeat from ever waiting for the GIL, which
could cause erroneous heartbeat failures.
ad971e3
Jan 13, 2012
Min RK add test notebook and script for #1260 (GIL-related heartbeat failures)
per #1127
7e81bf6
Thomas Kluyver Fix syntax for Python 2.6 - no set literals. a8dc95a
Min RK fix null comparisons in sqlitedb backend
associated test added and passing
ec3188c
Min RK parallel heart also gets its own Context 6c32815
Min RK Merge pull request #1262 from minrk/hbgil
Heartbeat no longer shares the app's Context

Fixes in both the single and parallel kernels, preventing the heartbeat thread from sharing the zmq Context with the rest of the process.  Non-copying sends require grabbing the GIL from the zmq io-thread in order to free memory, which could let Python get in the way of the heartbeat.

Test script and notebook added to examples directory.

closes #1260
1c4daed
Min RK match log format in Scheduler to rest of parallel apps 05f49f2
Min RK add NoDB for non-recording Hub
When used, this disables database-based actions in the Hub.

Useful for minimizing Hub memory consumption.
1aaad01
Min RK Merge pull request #1253 from ivanov/profile_auto_create
set auto_create flag for notebook apps

Fixes first use of bundled profiles when used with the notebook (e.g. ipython --profile=sympy).
9bb4034
Jan 15, 2012
Min RK document TaskScheduler.hwm behavior 7c46401
Min RK Merge pull request #1257 from minrk/kmclass
use self.kernel_manager_class in qtconsoleapp

Subclasses of QtConsoleApp can now override kernel_manager_class with their own version.
5d833ca
Min RK Merge pull request #1222 from minrk/mapreference
allow Reference as callable in map/apply

This allows behaviors like:

    rf = parallel.Reference('f')
    ar = view.map(rf, *sequences)

where the function 'f' is defined on the engines, and can even be different.
5608bfe
Min RK Merge pull request #1267 from minrk/nodb
add `--nodb` option for non-recording Hub

This allows simple use cases to avoid needing to call `purge_results` to prevent memory growth of the Hub.
80c3873
Min RK Merge pull request #1213 from punchagan/minor-typo
Fix minor typo in history_console_widget.py
9e5238d
Jan 16, 2012
crack at templatizing notebook.html to use layout.html e33a843
Something went wrong with that request. Please try again.