Commit Graph

2780 Commits

Author SHA1 Message Date
Thomas Kluyver
1c9386b6d6 StreamCapturer should die if main process crashes. 2013-11-06 09:59:51 -08:00
Min RK
5e4d0fb0e2 Merge pull request #4496 from takluyver/i4495
Pass nbformat object to write call to save .py script

Closes #4495
2013-11-05 17:55:52 -08:00
Thomas Kluyver
b829043a60 Add test for saving notebook with .py script 2013-11-05 17:43:36 -08:00
Thomas Kluyver
8ed3a725f3 Pass nbformat object to write call to save .py script
Closes gh-4495
2013-11-05 17:35:36 -08:00
Min RK
4ee44b3871 Merge pull request #4466 from minrk/pandoc-preamble
various pandoc latex fixes

- add missing declarations to latex_base (required for pandoc-highlighted code in markdown)
- fix ansi color in latex, which didn't work in a variety of ways.

closes #4245
2013-11-05 12:30:55 -08:00
Min RK
5ff1030fe7 Merge pull request #4473 from takluyver/setup23
update script generation in setup.py

These changes:
- Give us scripts called `ipython` and (`ipython2` or `ipython3`) for any installation. (and likewise for each of iptest, ipcontroller, etc.)
- Add a new `setup.py symlink` target, to use instead of `develop`, which installs scripts and symlinks the library into site-packages, without using setuptools.
- Removes the static script entry points - all our entry points are now automatically generated.
2013-11-05 11:56:40 -08:00
Thomas Kluyver
655e870d02 Add comment to automatically generated scripts. 2013-11-05 08:51:44 -08:00
Min RK
97ea238485 Merge pull request #4476 from jdfreder/rm_js_blankspace_onload
Fix: Remove space added by display(JavaScript) on page reload
2013-11-04 11:31:22 -08:00
Min RK
a1afcd92b4 Merge pull request #4398 from Carreau/no-tooltip-on-tab
[Notebook] Deactivate tooltip on tab by default.
2013-11-04 11:29:38 -08:00
Min RK
300e3437ca Merge pull request #4480 from takluyver/docs-shotgun-2
Further cleanup of various minor docs things.
2013-11-04 11:29:11 -08:00
Thomas Kluyver
4de9ef1f8b Merge pull request #4479 from ivanov/js-timeout
yet another JS race condition fix
2013-11-04 10:16:21 -08:00
Thomas Kluyver
ed281bacb4 Miscellaneous doc fixes 2013-11-01 19:14:09 -07:00
Paul Ivanov
2ab51dc1a5 yet another JS race condition fix
this should greatly reduce the number of timeouts seen in the JS tests
2013-11-01 19:10:45 -07:00
Paul Ivanov
6eb3170963 Merge pull request #4410 from ivanov/close-new-tabs-chrome
make close-and-halt work on new tabs in Chrome
2013-11-01 12:53:38 -07:00
Min RK
72611e43f2 Merge pull request #4469 from takluyver/py3-getcwdu
Python 3 & getcwdu

We were using the os.getcwdu() function in several places. That doesn't exist on Python 3, but the path.py module was masking that by setting os.getcwdu = os.getcwd. As described in #4462, however, that didn't always work.

This adds a reference in py3compat which points to getcwd on Python 3 and getcwdu in Python 2.
2013-11-01 12:50:09 -07:00
Jonathan Frederic
1a5e26dd5a Removed left over log statements 2013-11-01 18:45:02 +00:00
Jonathan Frederic
96f5cc942b Fix blank space added by included Javascript on page refresh or notebook load 2013-11-01 18:42:37 +00:00
Thomas Kluyver
883c46b5b5 Rework setup to allow installing on Python 2 and 3.
Scripts named ipython and ipython[23], etc.

Neither distutils nor setuptools made this easy.
2013-10-31 17:38:34 -07:00
Thomas Kluyver
557fb3f4ae Python 3 compatibility for os.getcwdu() 2013-10-31 12:37:45 -07: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
MinRK
95efb7ae5b use align environment, not aligned
aligned is only for when you are already inside a math environment (e.g. inside align)
2013-10-31 09:40:12 -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
Paul Ivanov
1123af8528 make close-and-halt work on new tabs in Chrome
this is not possible in Firefox, as new tabs/windows which were *not*
opened via a script ( window.open call ) are not allowed to be closed
via window.close and will yield a message like

--
[11:50:59.691] Scripts may not close windows that were not opened by script. @ http://localhost:8888/static/notebook/js/menubar.js:105
2013-10-28 11:00:42 -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