Skip to content

Flatten IPython.frontend#3450

Merged
fperez merged 31 commits into
masterfrom
flatten
Jun 28, 2013
Merged

Flatten IPython.frontend#3450
fperez merged 31 commits into
masterfrom
flatten

Conversation

@minrk

@minrk minrk commented Jun 20, 2013

Copy link
Copy Markdown
Member

Flatten IPython.frontend

Finishing up @fperez PR #3395, since he is unavailable. Only change is to add the final step:

IPython.frontend.html.notebook -> IPython.html (as opposed to IPython.html.notebook)

Issued from ipython org, so any core dev can make final adjustments.

closed #3395

  • announce to -dev list to remove frontend/ directory and all stale .pyc files

@minrk

minrk commented Jun 20, 2013

Copy link
Copy Markdown
Member Author

The shim is a tiny bit more complicated now, since it's not just moving IPython.frontend.* to IPython.* anymore, as IPython.frontend.html.notebook became just IPython.html. A result of the extra shim is that there is one old import that doesn't work:

from IPython.frontend.html import notebook

but

from IPython.frontend.html.notebook[.submod] import whatever

works just fine.

It seems to be an artifact of sys.modules['IPython.frontend.html.notebook'] already existing as a module, but not being a submodule of what IPython.frontend.html would point to.

@tkf

tkf commented Jun 20, 2013

Copy link
Copy Markdown
Contributor

You don't plan to have html-based console? If so, I think IPython.html would be not the bast place for notebook.

@takluyver

Copy link
Copy Markdown
Member

I'd like to have an html console, but I think it will be part and parcel of
the notebook interface, not something separate. In that sense, a common
'html' directory makes sense.

On 20 June 2013 16:48, Takafumi Arakaki notifications@github.com wrote:

You don't plan to have html-based console? If so, I think IPython.htmlwould be not the bast place for notebook.


Reply to this email directly or view it on GitHubhttps://github.com//pull/3450#issuecomment-19762226
.

@minrk

minrk commented Jun 21, 2013

Copy link
Copy Markdown
Member Author

We've learned from the entangling of HTML things and static file dirs, that even if/when we add an HTML console, we will probably still only have one main webapp, and just add to it. Console-related bits will get their own service-related subdirs, etc., but it wouldn't be an independent entity.

@fperez

fperez commented Jun 22, 2013

Copy link
Copy Markdown
Member

It looks like this one has a conflict again...

@minrk

minrk commented Jun 22, 2013

Copy link
Copy Markdown
Member Author

rebased

fperez and others added 24 commits June 27, 2013 11:13
Unfortunately for some very weird reason, this code can't be called as
a function, so I inlined a verbatim copy of importstring.import_item.
@minrk

minrk commented Jun 27, 2013

Copy link
Copy Markdown
Member Author

@ellisonbg @fperez I thought this was supposed to merge before too many more PRs start coming in. I've had to rebase it three times already.

@ellisonbg

Copy link
Copy Markdown
Member

Will try to merge today at scipy sprints

Sent from my iPhone

On Jun 27, 2013, at 1:15 PM, Min RK notifications@github.com wrote:

@ellisonbg @fperez I thought this was supposed to merge before too many more PRs start coming in. I've had to rebase it three times already.


Reply to this email directly or view it on GitHub.

@takluyver

Copy link
Copy Markdown
Member

@ivanov and I have run the tests successfully, although we had to resolve some issues with stale bytecode files.

@damianavila

Copy link
Copy Markdown
Member

my tests run ok too... great

fperez added a commit that referenced this pull request Jun 28, 2013
Flatten IPython.frontend, moving all its components to the top-level of IPython.

This includes a shim module that allows older projects to maintain backwards compatibility while warning them loudly about the change, so they can adapt to the new API.
@fperez fperez merged commit 0c0c1a1 into master Jun 28, 2013
@minrk minrk deleted the flatten branch June 28, 2013 20:11
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Flatten IPython.frontend, moving all its components to the top-level of IPython.

This includes a shim module that allows older projects to maintain backwards compatibility while warning them loudly about the change, so they can adapt to the new API.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants