Commit Graph

2758 Commits

Author SHA1 Message Date
Jonathan Frederic
96f5cc942b Fix blank space added by included Javascript on page refresh or notebook load 2013-11-01 18:42:37 +00:00
Paul Ivanov
c4b9e69793 Merge pull request #4451 from ivanov/shutdown-js
fix: allow JS test to run after shutdown test
2013-10-31 10:49:45 -07:00
Thomas Kluyver
8f440770bf Merge pull request #4456 from takluyver/stream-capturer-simplify
Simplify StreamCapturer for subprocess testing
2013-10-30 16:44:31 -07:00
Thomas Kluyver
28fcac5088 Don't use select() in StreamCapturer
select() on Windows only works with sockets, not regular file
descriptors.
2013-10-29 17:08:34 -07:00
Paul Ivanov
4901f5fc16 don't delete casper instance on shutdown test
a lunch conversation with @minrk and @takluyver lead me to just make a
popup and have it be closed, instead of having to reorder the test suite
so that this test always runs last. Now it doesn't matter what order the
test suite runs in, and gives us a pattern for testing window closing
behavior should we need it elsewhere.
2013-10-29 14:58:28 -07:00
Thomas Kluyver
acd00de9dd Simplify StreamCapturer for subprocess testing
Rather than using a transient pipe for each subprocess started, the
StreamCapturer now makes a single pipe, and subprocesses redirect their
output to it.

So long as this works on Windows (I've done brief testing, and os.pipe()
seems to be functional), this will hopefully make this much more robust.
The recent failures in ShiningPanda on IPython.parallel have been caused
by StreamCapturer.
2013-10-29 12:24:24 -07:00
Paul Ivanov
0f25ac58b3 Merge pull request #4438 from takluyver/1codebase
Single codebase Python 3 support (again)
2013-10-29 11:47:51 -07:00
Thomas Kluyver
93ee2d7173 Make sessions REST API test more robust.
Was seeing failures on Windows because it failed to delete the folder.
2013-10-29 09:15:57 -07:00
Thomas Kluyver
0e9a7c0874 Remove unused imports in IPython.html.notebook.handlers 2013-10-29 09:15:57 -07:00
Thomas Kluyver
9fd838d624 Fix imports in IPython.html.utils 2013-10-29 09:15:56 -07:00
Thomas Kluyver
79c0712752 Catch failures reading data from terminated subprocesses 2013-10-29 09:15:56 -07:00
Thomas Kluyver
d729dfbbe2 Fix passing extra arguments to Python test controllers 2013-10-29 09:15:56 -07:00
Thomas Kluyver
81660c08ce Allow running Python tests on one section of the codebase 2013-10-29 09:15:56 -07:00
Thomas Kluyver
bce32ec03b Fixes for notebook session manager 2013-10-29 09:15:56 -07:00
Thomas Kluyver
e8d357707a Fix renaming scripts 2013-10-29 09:15:55 -07:00
Thomas Kluyver
432377439b Fix renaming scripts with 3 suffix on Python 3 2013-10-29 09:15:55 -07:00
Thomas Kluyver
27c8c81c05 Update setup.py to not use 2to3 2013-10-29 09:15:55 -07:00
Thomas Kluyver
f65b3a1495 Use StringIO.StringIO on Python 2.
io.StringIO is strict about unicode, StringIO.StringIO isn't.
2013-10-29 09:15:55 -07:00
Thomas Kluyver
51040fb768 Update imports for Python 3
2to3 fixer imports (+ manual changes)
2013-10-29 09:15:54 -07:00
Thomas Kluyver
4a14ed7e22 Replace references to unicode and basestring 2013-10-29 09:15:54 -07:00
Thomas Kluyver
d4532983f4 Convert print statements to print function calls
libmodernize.fixes.fix_print
2013-10-29 09:14:15 -07:00
Min RK
d1de1d26f4 Merge pull request #4198 from jdfreder/versionconversion_nbconvert
add upgrade / downgrade to nbformat
2013-10-28 19:54:13 -07:00
Paul Ivanov
4ffe489e72 Merge pull request #4415 from ivanov/more-tooltips
More tooltips in the Notebook menu
2013-10-28 13:51:39 -07:00
Paul Ivanov
e608c6d07a fix: allow JS test to run after shutdown test
shutdown notebook test closes casper browser, here we re-instatiate it
after the test
2013-10-28 13:46:55 -07:00
Min RK
d797f8950f Merge pull request #4450 from ivanov/remove-old-tornado-monkeypatch
remove monkey patch for older versions of tornado
2013-10-28 11:39:47 -07:00
Paul Ivanov
f04eca3ddd remove monkey patch for older versions of tornado
Since we now depend on Tornado >= 3.1, this code path is no longer
necessary
2013-10-28 11:07:24 -07:00
Min RK
4e8bc066e9 Merge pull request #4435 from minrk/tornado-tweaks
raise 404 on not found static file
2013-10-27 13:12:08 -07:00
Min RK
57fa14a2fa Merge pull request #4442 from Carreau/fix-oir
finish object_info_request/object_info rename in tooltip
2013-10-26 11:04:22 -07:00
Matthias BUSSONNIER
a74c36b62a remove compatibility layer 2013-10-26 19:59:49 +02:00
Min RK
8b58e38990 Merge pull request #4436 from minrk/require-ext
allow `require("nbextensions/extname")` to load from IPYTHONDIR/nbextensions
2013-10-26 10:41:00 -07:00
Matthias BUSSONNIER
bdb1c94137 fix and add shim for change introduce by #4195
comm merging renamed object_info_request to object_info
2013-10-26 14:04:55 +02:00
Min RK
4f3f1f1ebb Merge pull request #4437 from minrk/etag
don't compute etags in static file handlers
2013-10-25 16:54:15 -07:00
Min RK
c3e6e625a7 Merge pull request #4427 from minrk/checkpoint-on-first-save
notebooks should always have one checkpoint

closes #4396
2013-10-25 13:36:59 -07:00
Matthias Bussonnier
5bd89b7376 Merge pull request #4425 from Carreau/fix-js-python
Fix impossibility to upload notebooks.
2013-10-25 11:41:42 -07:00
Matthias BUSSONNIER
79f1edc5e9 fix notebook upload
pythonnism + PUT instead of POST
2013-10-25 20:23:54 +02:00
MinRK
f8ddcffacb allow require("nbextensions/extname") to load from IPYTHONDIR/nbextensions 2013-10-24 15:32:28 -07:00
MinRK
7ea4db6c48 don't compute etags in static file handlers
etags skip cache timing, which we probably don't want.  If-Modified-Since is good enough for us.
2013-10-24 14:25:15 -07:00
Min RK
0aaafce4af Merge pull request #4195 from minrk/widget-msg
IPEP 21:  widget messages
2013-10-24 12:19:41 -07:00
MinRK
ff744e25cd raise 404 on not found static file
master gives 403 due to empty string being outside of root
2013-10-24 11:14:50 -07:00
Thomas Kluyver
daf15735bd Merge pull request #4428 from minrk/tornado-3.1
bump minimum tornado version to 3.1.0
2013-10-23 14:36:25 -07:00
MinRK
6fa13ebb98 bump minimum tornado version to 3.1.0
The no-hidden behavior of the files handler
already requires this, but instead of raising, it just doesn't hide hidden files.

Bumping the minimum version also allows much cleaner static file handler subclasses.
2013-10-23 14:04:35 -07:00
Thomas Kluyver
45faf9a949 Merge commit '37dadeb' (most of PR #4391)
Conflicts:
	IPython/testing/iptestcontroller.py
2013-10-23 14:00:14 -07:00
Thomas Kluyver
7333d23457 Merge pull request #4285 from ivanov/notebook-casperjs-tests
Notebook javascript test suite using CasperJS
2013-10-23 13:58:06 -07:00
Paul Ivanov
80ac24683f give travis 10 seconds to start server 2013-10-23 12:28:30 -07:00
Paul Ivanov
357b78171a fix: JS kernel state should reflect killed state 2013-10-23 12:22:08 -07:00
MinRK
79a7b1e421 fix tornado log propagation
in the notebook
2013-10-23 12:01:45 -07:00
Paul Ivanov
26b5a76841 don't use test.begin
the PPA we use on Travis CI doesn't have CasperJS 1.1.0-DEV yet, so
we're better off not using it for now.
2013-10-23 11:49:43 -07:00
Paul Ivanov
4993ddd498 make js tests quieter, silence notebook server 2013-10-23 11:48:33 -07:00
Paul Ivanov
217b43cf87 use test.begin to give test group a name 2013-10-23 11:05:59 -07:00
Paul Ivanov
641f157fd9 add test for shutdown notebook 2013-10-23 11:05:59 -07:00