Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove legacy azure nbmanager #5089

Merged
merged 5 commits into from
Feb 19, 2014
Merged

Remove legacy azure nbmanager #5089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ed1c62
Remove legacy azure nbmanager
rgbkrk Feb 11, 2014
92e068a
Remove remaining refs to the Azure NB Manager
rgbkrk Feb 12, 2014
b7a6d1d
Add documentation for removal
rgbkrk Feb 13, 2014
a2a0872
Add pointers to simple nb manager and bookstore.
rgbkrk Feb 13, 2014
bc8f1a2
Change wording to say that the azure nb was actually removed
rgbkrk Feb 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
143 changes: 0 additions & 143 deletions IPython/html/services/notebooks/azurenbmanager.py
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions IPython/testing/iptest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ def test_for(item, min_version=None, callback=extract_version):
have['oct2py'] = test_for('oct2py')
have['tornado'] = test_for('tornado.version_info', (3,1,0), callback=None)
have['jinja2'] = test_for('jinja2')
have['azure'] = test_for('azure')
have['requests'] = test_for('requests')
have['sphinx'] = test_for('sphinx')
have['casperjs'] = is_cmd_found('casperjs')
Expand Down Expand Up @@ -278,8 +277,6 @@ def will_run(self):
sec.exclude('fabfile')
if not have['jinja2']:
sec.exclude('notebookapp')
if not have['azure']:
sec.exclude('services.notebooks.azurenbmanager')
if not have['pygments'] or not have['jinja2']:
sec.exclude('nbconvert')

Expand Down
7 changes: 0 additions & 7 deletions docs/autogen_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@
r'\.utils\.py3compat',
]

# We're rarely working on machines with the Azure SDK installed, so we
# skip the module that needs it in that case.
try:
import azure # analysis:ignore
except ImportError:
docwriter.module_skip_patterns.append(r'\.html\.services\.notebooks\.azurenbmanager')

# Now, generate the outputs
docwriter.write_api_docs(outdir)
# Write index with .txt extension - we can include it, but Sphinx won't try
Expand Down
19 changes: 8 additions & 11 deletions docs/source/interactive/public_server.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,17 @@ files in the working directory of the notebook server, also known as the
use a different notebook manager class, which can
store the notebooks in a different format.

Currently, we ship a :class:`AzureNotebookManager` class that stores notebooks
in Azure blob storage. This can be used by adding the following lines to your
``ipython_notebook_config.py`` file::
The bookstore_ package currently allows users to store notebooks on Rackspace
CloudFiles or OpenStack Swift based object stores.

c.NotebookApp.notebook_manager_class =
'IPython.html.services.notebooks.azurenbmanager.AzureNotebookManager'
c.AzureNotebookManager.account_name = u'paste_your_account_name_here'
c.AzureNotebookManager.account_key = u'paste_your_account_key_here'
c.AzureNotebookManager.container = u'notebooks'
Writing a notebook manager is as simple as extending the base class
:class:`NotebookManager`. The simple_notebook_manager_ provides a great example
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the trailing underscore after simple_notebook_manager shouldn't be there, unless that's a reST feature.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a rest feature - it connects it to the link, defined below with a leading underscore. Not the most beautiful part of the rst syntax.

of an in memory notebook manager, created solely for the purpose of
illustrating the notebook manager API.

In addition to providing your Azure Blob Storage account name and key, you
will have to provide a container name; you can use multiple containers to
organize your notebooks.
.. _bookstore: https://github.com/rgbkrk/bookstore

.. _simple_notebook_manager: https://github.com/khinsen/simple_notebook_manager

Known issues
------------
Expand Down
1 change: 1 addition & 0 deletions docs/source/whatsnew/pr/incompat-azure.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* The Azure notebook manager was removed as it was no longer compatible with the notebook storage scheme