From c70632c7972915fd63cac92977ebd5b6ead1bfcc 2014-03-30 19:00:22 From: Brian E. Granger Date: 2014-03-30 19:00:22 Subject: [PATCH] Lots of documentation work. --- diff --git a/examples/Builtin Extensions/Index.ipynb b/examples/Builtin Extensions/Index.ipynb new file mode 100644 index 0000000..23cbd3a --- /dev/null +++ b/examples/Builtin Extensions/Index.ipynb @@ -0,0 +1,47 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:1d90c9be85e777f36c4a30cb65871f4dd6efab6504fafef74184ba3e053130c6" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [ + { + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "heading", + "level": 1, + "metadata": {}, + "source": [ + "Builtin Extensions" + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Tutorials" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "* [Cython Magics](Cython Magics.ipynb): magics for compiling and running Cython code in a cell\n", + "* [Octave Magic](Octave Magic.ipynb): magics for running Octave code in a cell\n", + "* [R Magics](R Magics.ipynb): magics for running R code in a cell" + ] + } + ], + "metadata": {} + } + ] +} \ No newline at end of file diff --git a/examples/Core/Index.ipynb b/examples/Core/Index.ipynb new file mode 100644 index 0000000..56777ca --- /dev/null +++ b/examples/Core/Index.ipynb @@ -0,0 +1,54 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:e9beaff0a182620a68fe43e907213d7d5f30b30f6fcf3ba97114f95ea3b61b55" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [ + { + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "heading", + "level": 1, + "metadata": {}, + "source": [ + "Core Syntax and Command Line Features" + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Tutorials" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "* [Cell Magics](Cell Magics.ipynb)\n", + "* [Script Magics](Script Magics.ipynb)" + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Examples" + ] + } + ], + "metadata": {} + } + ] +} \ No newline at end of file diff --git a/examples/Customization/Index.ipynb b/examples/Customization/Index.ipynb new file mode 100644 index 0000000..519dba7 --- /dev/null +++ b/examples/Customization/Index.ipynb @@ -0,0 +1,9 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [] +} \ No newline at end of file diff --git a/examples/Embedding/Index.ipynb b/examples/Embedding/Index.ipynb new file mode 100644 index 0000000..519dba7 --- /dev/null +++ b/examples/Embedding/Index.ipynb @@ -0,0 +1,9 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [] +} \ No newline at end of file diff --git a/examples/Index.ipynb b/examples/Index.ipynb new file mode 100644 index 0000000..c46a6e8 --- /dev/null +++ b/examples/Index.ipynb @@ -0,0 +1,59 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:7aef917e7be3cb0881b911b9dbab7a5198c83ddfaaca6ec3499716f4a347c87b" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [ + { + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "heading", + "level": 1, + "metadata": {}, + "source": [ + "IPython Documentation" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "This directory contains IPython's notebook-based documentation. This augments our [Sphinx-based documentation](http://ipython.org/ipython-doc/stable/index.html) with notebooks that contain interactive tutorials and examples. Over time, more of our documentation will be pulled into this format." + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Topics" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "* [Core](Core/Index.ipynb): IPython's core syntax and command line features available in all of our frontends\n", + "* [Notebook](Notebook/Index.ipynb): The IPython Notebook frontend\n", + "* [Widgets](Widgets/Index.ipynb): Interactive JavaScript/HTML widgets and `interact`\n", + "* [Parallel](Parallel/Index.ipynb): IPython's library for interactive parallel computing\n", + "* [Customization](Customization/Index.ipynb): How to configure IPython and customize it with magics, extensions, etc.\n", + "* [Embedding](Embedding/Index.ipynb): Embedding and reusing IPython's components into other applications\n", + "* [Builtin Extensions](Builtin Extensions/Index.ipynb): Extensions we ship with IPython\n", + "* [Misc](Misc/Index.ipynb): Content that doesn't fit anywhere else" + ] + } + ], + "metadata": {} + } + ] +} \ No newline at end of file diff --git a/examples/Misc/Index.ipynb b/examples/Misc/Index.ipynb new file mode 100644 index 0000000..519dba7 --- /dev/null +++ b/examples/Misc/Index.ipynb @@ -0,0 +1,9 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [] +} \ No newline at end of file diff --git a/examples/Notebook/Index.ipynb b/examples/Notebook/Index.ipynb new file mode 100644 index 0000000..4e5df5a --- /dev/null +++ b/examples/Notebook/Index.ipynb @@ -0,0 +1,73 @@ +{ + "metadata": { + "name": "", + "signature": "sha256:ef5ecdf40e119cd6da50579d4d594dc74cb8c063a74b3f3f8f76834b783f750e" + }, + "nbformat": 3, + "nbformat_minor": 0, + "worksheets": [ + { + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { + "cell_type": "heading", + "level": 1, + "metadata": {}, + "source": [ + "IPython Notebook" + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Tutorials" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "* [User Interface](User Interface.ipynb)\n", + "* [Running Code](Running Code.ipynb)\n", + "* [Basic Output](Basic Output.ipynb)\n", + "* [Plotting with Matplotlib](Plotting with Matplotlib.ipynb)\n", + "* [Markdown Cells](Markdown Cells.ipynb)\n", + "* [Typesetting Math Using MathJax](Typesetting Math Using MathJax.ipynb)\n", + "* [Display System](Display System.ipynb)\n", + "* [Custom Display Logic](Custom Display Logic.ipynb)" + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Examples" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "* [Trapezoid Rule](Trapezoid Rule.ipynb)\n", + "* [SymPy](SymPy.ipynb)\n", + "* [Raw Input](Raw Input.ipynb)\n", + "* [Progress Bars](Progress Bars.ipynb)\n", + "* [Importing Notebooks](Importing Notebooks.ipynb)\n", + "* [Connecting with the Qt Console](Connecting with the Qt Console.ipynb)\n", + "* [Animations Using clear_output](Animations Using clear_output.ipynb)" + ] + } + ], + "metadata": {} + } + ] +} \ No newline at end of file diff --git a/examples/Notebook/images/python-logo.svg b/examples/Notebook/images/python_logo.svg similarity index 100% rename from examples/Notebook/images/python-logo.svg rename to examples/Notebook/images/python_logo.svg diff --git a/examples/Widgets/TutorialIndex.ipynb b/examples/Parallel/Index.ipynb similarity index 82% rename from examples/Widgets/TutorialIndex.ipynb rename to examples/Parallel/Index.ipynb index cdd361a..46363c5 100644 --- a/examples/Widgets/TutorialIndex.ipynb +++ b/examples/Parallel/Index.ipynb @@ -1,7 +1,7 @@ { "metadata": { "name": "", - "signature": "sha256:a2f4e040950648308ac7ec5f95d83948b4499ffc68e6bfd8f6fe8784955f52fb" + "signature": "sha256:18fc966556ef56ab0ea6e2977e0d5c9b253fc6f9735839ccf9820156f3f82c95" }, "nbformat": 3, "nbformat_minor": 0, @@ -9,18 +9,18 @@ { "cells": [ { - "cell_type": "heading", - "level": 1, + "cell_type": "markdown", "metadata": {}, "source": [ - "Widget Tutorials" + "" ] }, { - "cell_type": "markdown", + "cell_type": "heading", + "level": 1, "metadata": {}, "source": [ - "This directory includes a tutorials related to the IPython notebook widget framework." + "Parallel Computing with IPython" ] }, { @@ -28,14 +28,14 @@ "level": 2, "metadata": {}, "source": [ - "Interact" + "Tutorials" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "* [Using Interact](Using Interact.ipynb)" + "* [Data Publication API](Data Publication API.ipynb) " ] }, { @@ -43,19 +43,14 @@ "level": 2, "metadata": {}, "source": [ - "Widgets" + "Examples" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "- [Basics](Basics.ipynb) \n", - "- [Events](Events.ipynb) \n", - "- [Placement](Placement.ipynb) \n", - "- [Styles](Styles.ipynb) \n", - "- [Alignment](Alignment.ipynb) \n", - "- [Custom Widgets](Custom Widgets.ipynb) " + "* " ] } ], diff --git a/examples/Parallel/InteractiveMPI.ipynb b/examples/Parallel/Monitoring an MPI Simulation - 1.ipynb similarity index 100% rename from examples/Parallel/InteractiveMPI.ipynb rename to examples/Parallel/Monitoring an MPI Simulation - 1.ipynb diff --git a/examples/Parallel/InteractiveMPI-publish-data.ipynb b/examples/Parallel/Monitoring an MPI Simulation - 2.ipynb similarity index 100% rename from examples/Parallel/InteractiveMPI-publish-data.ipynb rename to examples/Parallel/Monitoring an MPI Simulation - 2.ipynb diff --git a/examples/Parallel/taskmap.ipynb b/examples/Parallel/Parallel Decorator and map.ipynb similarity index 89% rename from examples/Parallel/taskmap.ipynb rename to examples/Parallel/Parallel Decorator and map.ipynb index 80661b8..6f96038 100644 --- a/examples/Parallel/taskmap.ipynb +++ b/examples/Parallel/Parallel Decorator and map.ipynb @@ -1,6 +1,7 @@ { "metadata": { - "name": "" + "name": "", + "signature": "sha256:8781781d8835d77bf0f71b535b72ee2718405543c48e87ad0408242119cdb3cc" }, "nbformat": 3, "nbformat_minor": 0, @@ -52,14 +53,7 @@ "output_type": "stream", "stream": "stdout", "text": [ - "Simple, default map: " - ] - }, - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "[0, 2, 4, 6, 8, 10, 12, 14, 16, 18]\n" + "Simple, default map: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18]\n" ] } ], @@ -81,7 +75,7 @@ "output_type": "stream", "stream": "stdout", "text": [ - "Submitted tasks, got ids: ['d482fcb3-f8e9-41ff-ba16-9fd4118324f1', 'e4fe38dd-8a4d-4f3a-a111-e4c9fdbea7c3', '580431f4-ac66-4517-b03e-a58aa690a87b', '19a012cf-5d9d-4cf3-9656-d56263958c0e', '012ebbb5-5def-47ad-a247-20f88d2c8980', '0dea6cdb-5b22-4bac-a1bb-7544c0ef44e6', '909d073f-7eee-42a7-8f3b-8f7aa32e7639', 'be6c7466-d541-47a0-b12d-bc408d40ad77', 'b97b5967-a5a3-45c5-95cc-44e0823fd646', '69b06902-9526-42d9-bda6-c943be19cc5a']\n", + "Submitted tasks, got ids: ['b4d86123-967a-4f21-b9c5-8a77a69a3ced', '97401998-891d-4729-8288-ae1b97c28235', '1586cf7e-32c7-4864-bd0e-6aab16e07a3f', 'f6770223-59c3-4344-a69a-5d555d1dfb7f', '0ebb71da-6e16-44ac-917a-be978fd3787d', '582443c5-937e-45b0-9f13-5607c53cba60', '8d453d87-d70d-4fbd-a2c4-994ab3a8b6c7', '0a680757-1a59-4826-969c-523a45f3d76f', '63a3e983-a205-4f07-b494-ec86b2cdd004', '79b34cbb-aa93-4d11-8746-28969dbdd3ec']\n", "Using a mapper: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18]\n" ] } diff --git a/examples/Parallel/parallel_mpi.ipynb b/examples/Parallel/Using MPI with IPython Parallel.ipynb similarity index 100% rename from examples/Parallel/parallel_mpi.ipynb rename to examples/Parallel/Using MPI with IPython Parallel.ipynb diff --git a/examples/Parallel/map.py b/examples/Parallel/map.py deleted file mode 100644 index c48ede0..0000000 --- a/examples/Parallel/map.py +++ /dev/null @@ -1,38 +0,0 @@ -from __future__ import print_function - -from IPython.parallel import * - -client = Client() -view = client.load_balanced_view() - -@view.remote(block=True) -def square(a): - """return square of a number""" - return a*a - -squares = map(square, range(42)) - -# but that blocked between each result; not exactly useful - -square.block = False - -arlist = map(square, range(42)) -# submitted very fast - -# wait for the results: -squares2 = [ r.get() for r in arlist ] - -# now the more convenient @parallel decorator, which has a map method: -view2 = client[:] -@view2.parallel(block=False) -def psquare(a): - """return square of a number""" - return a*a - -# this chunks the data into n-negines jobs, not 42 jobs: -ar = psquare.map(range(42)) - -# wait for the results to be done: -squares3 = ar.get() -print(squares == squares2, squares3==squares) -# True diff --git a/examples/Parallel/multiengine1.ipy b/examples/Parallel/multiengine1.ipy deleted file mode 100644 index 1e5926e..0000000 --- a/examples/Parallel/multiengine1.ipy +++ /dev/null @@ -1,212 +0,0 @@ -#------------------------------------------------------------------------------- -# Imports -#------------------------------------------------------------------------------- - -import time -import numpy - -# import IPython.kernel.magic -from IPython.parallel import Client, Reference -from IPython.parallel import error - -rc = Client() -mux = rc[:] - -#------------------------------------------------------------------------------- -# Setup -#------------------------------------------------------------------------------- - -%load_ext parallelmagic - -mux.block = True -mux.clear() -mux.activate() - -n = len(rc) -assert n >= 4, "Not Enough Engines: %i, 4 needed for this script"%n - -values = [ - 10, - 1.0, - range(100), - ('asdf', 1000), - {'a': 10, 'b': 20} - ] - -keys = ['a','b','c','d','e'] - -sequences = [ - range(100), - numpy.arange(100) -] - -#------------------------------------------------------------------------------- -# Blocking execution -#------------------------------------------------------------------------------- - -# Execute - -with mux.sync_imports(): - import math - import numpy - -mux.execute('a = 2.0*math.pi') -print mux['a'] - -for id in mux.targets: - mux.execute('b=%d' % id, targets=id) - - -try: - mux.execute('b = 10',targets=max(mux.targets)+1) -except IndexError: - print "Caught invalid engine ID OK." - -try: - mux.apply(lambda : 1/0) -except error.CompositeError: - print "Caught 1/0 correctly." - - - -%px print a, b - -try: - %px 1/0 -except error.CompositeError: - print "Caught 1/0 correctly." - - -# %autopx - -%px a = numpy.random.random((4,4)) -%px a = a+a.transpose() -# %autopx - -print mux.apply(numpy.linalg.eigvals, Reference('a')) - - - -mux.targets = [0,2] -%px a = 5 -mux.targets = [1,3] -%px a = 10 -mux.targets = rc.ids -print mux['a'] - - -# Push/Pull - -mux.push(dict(a=10, b=30, c={'f':range(10)})) -mux.pull(('a', 'b')) - -for id in mux.targets: - mux.push(dict(a=id), targets=id) - - -for id in mux.targets: - mux.pull('a', targets=id) - -mux.pull('a') - - -mux['a'] = 100 -mux['a'] - -# get_result/reset/keys - -mux.get_result() -%result -mux.apply(lambda : globals().keys()) -mux.clear() -mux.apply(lambda : globals().keys()) - -try: - %result -except error.CompositeError: - print "Caught IndexError ok." - - -%px a = 5 -mux.get_result(-1) -mux.apply(lambda : globals().keys()) - -# Queue management methods - -%px import time -ars = [mux.apply_async(time.sleep, 2.0) for x in range(5)] - - -mux.queue_status() -time.sleep(3.0) -mux.abort(ars, block=True) -mux.queue_status() -time.sleep(2.0) -mux.queue_status() - -mux.wait(ars) - -for ar in ars: - try: - ar.r - except error.CompositeError: - print "Caught QueueCleared OK." - - -# scatter/gather - -mux.scatter('a', range(10)) -mux.gather('a') -mux.scatter('b', numpy.arange(10)) -mux.gather('b') - -#------------------------------------------------------------------------------- -# Non-Blocking execution -#------------------------------------------------------------------------------- - -mux.block = False - -# execute - -ar1 = mux.execute('a=5') -with mux.sync_imports(): - import sets - -ar1.wait() - -ar1 = mux.execute('1/0') -ar2 = mux.execute('c = sets.Set()') - -mux.wait((ar1, ar2)) -try: - ar1.r -except error.CompositeError: - print "Caught ZeroDivisionError OK." - -ar = mux.execute("arint 'hi'") -ar.r - -ar = mux.apply(lambda : 1/0) -try: - ar.r -except error.CompositeError: - print "Caught ZeroDivisionError OK." - -# Make sure we can reraise it! -try: - ar.r -except error.CompositeError: - print "Caught ZeroDivisionError OK." - -# push/pull - -ar1 = mux.push(dict(a=10)) -ar1.get() -ar2 = mux.pull('a') -ar2.r - - -# This is a command to make sure the end of the file is happy. - -print "The tests are done!" - diff --git a/examples/Parallel/multiengine2.py b/examples/Parallel/multiengine2.py deleted file mode 100644 index 5113e1b..0000000 --- a/examples/Parallel/multiengine2.py +++ /dev/null @@ -1,29 +0,0 @@ -#------------------------------------------------------------------------------- -# Imports -#------------------------------------------------------------------------------- -from __future__ import print_function - -import time - -from IPython.parallel import Client - -#------------------------------------------------------------------------------- -# Setup -#------------------------------------------------------------------------------- - -mux = Client()[:] - -mux.clear() - -mux.block=False - -ar1 = mux.apply(time.sleep, 5) -ar2 = mux.push(dict(a=10,b=30,c=range(20000),d='The dog went swimming.')) -ar3 = mux.pull(('a','b','d'), block=False) - -print("Try a non-blocking get_result") -ar4 = mux.get_result() - -print("Now wait for all the results") -mux.wait([ar1,ar2,ar3,ar4]) -print("The last pull got:", ar4.r) diff --git a/examples/Parallel/multienginemap.py b/examples/Parallel/multienginemap.py deleted file mode 100644 index de9ae2d..0000000 --- a/examples/Parallel/multienginemap.py +++ /dev/null @@ -1,19 +0,0 @@ -from __future__ import print_function - -from IPython.parallel import Client - -rc = Client() -view = rc[:] -result = view.map_sync(lambda x: 2*x, range(10)) -print("Simple, default map: ", result) - -ar = view.map_async(lambda x: 2*x, range(10)) -print("Submitted map, got AsyncResult: ", ar) -result = ar.r -print("Using map_async: ", result) - -@view.parallel(block=True) -def f(x): return 2*x - -result = f.map(range(10)) -print("Using a parallel function: ", result) diff --git a/examples/Parallel/task1.ipynb b/examples/Parallel/task1.ipynb deleted file mode 100644 index b4b65c8..0000000 --- a/examples/Parallel/task1.ipynb +++ /dev/null @@ -1,141 +0,0 @@ -{ - "metadata": { - "name": "task1" - }, - "nbformat": 3, - "nbformat_minor": 0, - "worksheets": [ - { - "cells": [ - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# Simple task farming example" - ] - }, - { - "cell_type": "code", - "collapsed": true, - "input": [ - "from __future__ import print_function\n", - "from IPython.parallel import Client" - ], - "language": "python", - "metadata": {}, - "outputs": [], - "prompt_number": 1 - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "A `Client.load_balanced_view` is used to get the object used for working with load balanced tasks." - ] - }, - { - "cell_type": "code", - "collapsed": true, - "input": [ - "rc = Client()\n", - "v = rc.load_balanced_view()" - ], - "language": "python", - "metadata": {}, - "outputs": [], - "prompt_number": 2 - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Set the variable `d` on all engines:" - ] - }, - { - "cell_type": "code", - "collapsed": true, - "input": [ - "rc[:]['d'] = 30" - ], - "language": "python", - "metadata": {}, - "outputs": [], - "prompt_number": 3 - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Define a function that will be our task:" - ] - }, - { - "cell_type": "code", - "collapsed": true, - "input": [ - "def task(a):\n", - " return a, 10*d, a*10*d" - ], - "language": "python", - "metadata": {}, - "outputs": [], - "prompt_number": 4 - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Run the task once:" - ] - }, - { - "cell_type": "code", - "collapsed": true, - "input": [ - "ar = v.apply(task, 5)" - ], - "language": "python", - "metadata": {}, - "outputs": [], - "prompt_number": 5 - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Print the results:" - ] - }, - { - "cell_type": "code", - "collapsed": false, - "input": [ - "print(\"a, b, c: \", ar.get())" - ], - "language": "python", - "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "a, b, c: [5, 300, 1500]\n" - ] - } - ], - "prompt_number": 6 - }, - { - "cell_type": "code", - "collapsed": false, - "input": [], - "language": "python", - "metadata": {}, - "outputs": [] - } - ], - "metadata": {} - } - ] -} \ No newline at end of file diff --git a/examples/Parallel/task2.py b/examples/Parallel/task2.py deleted file mode 100755 index d6520ec..0000000 --- a/examples/Parallel/task2.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 - -from IPython.parallel import Client -import time -import sys -flush = sys.stdout.flush - -rc = Client() -v = rc.load_balanced_view() -mux = rc[:] - - -for i in range(24): - v.apply(time.sleep, 1) - -for i in range(6): - time.sleep(1.0) - print("Queue status (vebose=False)") - print(v.queue_status(verbose=False)) - flush() - -for i in range(24): - v.apply(time.sleep, 1) - -for i in range(6): - time.sleep(1.0) - print("Queue status (vebose=True)") - print(v.queue_status(verbose=True)) - flush() - -for i in range(12): - v.apply(time.sleep, 2) - -print("Queue status (vebose=True)") -print(v.queue_status(verbose=True)) -flush() - -# qs = v.queue_status(verbose=True) -# queued = qs['scheduled'] - -for msg_id in v.history[-4:]: - v.abort(msg_id) - -for i in range(6): - time.sleep(1.0) - print("Queue status (vebose=True)") - print(v.queue_status(verbose=True)) - flush() - diff --git a/examples/Widgets/Index.ipynb b/examples/Widgets/Index.ipynb index 2839c3d..17c1573 100644 --- a/examples/Widgets/Index.ipynb +++ b/examples/Widgets/Index.ipynb @@ -1,7 +1,7 @@ { "metadata": { "name": "", - "signature": "sha256:80d852710c872fd0903d077bf8002d332c0e1256e0734573233e92c67684a321" + "signature": "sha256:09ffc895c9a111a5040efba2cb04a59cc8703bf86fa84e20e05c07da46112646" }, "nbformat": 3, "nbformat_minor": 0, @@ -9,11 +9,39 @@ { "cells": [ { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "" + ] + }, + { "cell_type": "heading", "level": 1, "metadata": {}, "source": [ - "Widget Examples" + "Interactive JavaScript Widgets" + ] + }, + { + "cell_type": "heading", + "level": 2, + "metadata": {}, + "source": [ + "Tutorials" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "- [Using Interact](Using Interact.ipynb)\n", + "- [Widgets Overview](Widgets Overview.ipynb) \n", + "- [Widget Events](Widget Events.ipynb) \n", + "- [Widget Placement](Widget Placement.ipynb) \n", + "- [Widget Styles](Widget Styles.ipynb) \n", + "- [Widget Alignment](Widget Alignment.ipynb) \n", + "- [Custom Widgets](Custom Widgets.ipynb)" ] }, { @@ -21,7 +49,7 @@ "level": 2, "metadata": {}, "source": [ - "Examples of how to create a custom widget:" + "Examples of custom widgets" ] }, { @@ -51,7 +79,7 @@ "* [Factoring](Factoring.ipynb)\n", "* [Image Browser](Image Browser.ipynb)\n", "* [Image Processing](Image Processing.ipynb)\n", - "* [Lorenz](Lorenz.ipynb)" + "* [Lorenz Differential Equations](Lorenz Differential Equations.ipynb)" ] } ], diff --git a/examples/Widgets/Lorenz.ipynb b/examples/Widgets/Lorenz Differential Equations.ipynb similarity index 100% rename from examples/Widgets/Lorenz.ipynb rename to examples/Widgets/Lorenz Differential Equations.ipynb diff --git a/examples/Widgets/Alignment.ipynb b/examples/Widgets/Widget Alignment.ipynb similarity index 100% rename from examples/Widgets/Alignment.ipynb rename to examples/Widgets/Widget Alignment.ipynb diff --git a/examples/Widgets/Events.ipynb b/examples/Widgets/Widget Events.ipynb similarity index 100% rename from examples/Widgets/Events.ipynb rename to examples/Widgets/Widget Events.ipynb diff --git a/examples/Widgets/Placement.ipynb b/examples/Widgets/Widget Placement.ipynb similarity index 100% rename from examples/Widgets/Placement.ipynb rename to examples/Widgets/Widget Placement.ipynb diff --git a/examples/Widgets/Styles.ipynb b/examples/Widgets/Widget Styles.ipynb similarity index 100% rename from examples/Widgets/Styles.ipynb rename to examples/Widgets/Widget Styles.ipynb diff --git a/examples/Widgets/Basics.ipynb b/examples/Widgets/Widgets Overview.ipynb similarity index 100% rename from examples/Widgets/Basics.ipynb rename to examples/Widgets/Widgets Overview.ipynb diff --git a/examples/Notebook/images/logo.png b/examples/images/ipython_logo.png similarity index 100% rename from examples/Notebook/images/logo.png rename to examples/images/ipython_logo.png Binary files a/examples/Notebook/images/logo.png and b/examples/images/ipython_logo.png differ