Commit Graph

1234 Commits

Author SHA1 Message Date
Bradley M. Froehle
cfc86faefb s/nt.assert_equals/nt.assert_equal/ 2012-07-17 08:30:53 -07:00
Bradley M. Froehle
05a30fa6d4 s/assertEquals/assertEqual/ 2012-07-17 08:30:53 -07:00
Thomas Kluyver
aaf911c5e5 Merge pull request #2140 from bfroehle/2to3_has_key
2to3: Apply `has_key` fixer.
2012-07-17 04:58:13 -07:00
Bradley M. Froehle
9ff624471d Skip has_key when running 2to3. 2012-07-15 09:55:56 -07:00
Thomas Kluyver
0c157dd01c Merge pull request #2134 from bfroehle/2to3_next
Apply 2to3 `next` fix.
2012-07-15 02:57:32 -07:00
Bradley M. Froehle
9dd190f134 Apply 2to3 next fix.
Manually set `next = __next__` for Python 2 support.
2012-07-13 15:59:26 -07:00
Bussonnier Matthias
0b44186d76 Merge pull request #2100 from Carreau/2to3fixes
python 2 and 3 compatibility without 2to3

apply some fixes :
- apply (deactivated in setup.py now)
- repr  (deactivated in setup.py now)
- print (only in modules with print >>)
- raise (partially) 

don't touch deathrow and quarantine.
2012-07-13 01:07:56 -07:00
Bussonnier Matthias
f38cf983c5 Merge pull request #2128 from Carreau/fixes-2120
open notebook copy in different tabs
2012-07-12 11:31:37 -07:00
Bussonnier Matthias
22e757f91d Merge pull request #2073 from Carreau/fixes-1997
Allows both password and prefix for notebook at the same time.
2012-07-12 11:28:33 -07:00
Matthias BUSSONNIER
ca65de9fa2 open notebook copy in different tabs
returning false to allow modifier+click,
otherwise open 2 tabs at once.
2012-07-12 18:19:13 +02:00
Bussonnier Matthias
4ec828c3db Merge pull request #1993 from Carreau/printview
Update print-view css, and link the print css when trying to print a notebook without going through the print view.
2012-07-12 06:18:25 -07:00
Matthias BUSSONNIER
011403a14f use print function in module with print >> 2012-07-05 14:32:56 +02:00
Matthias BUSSONNIER
bd2ccf816a deactivate 2to3 repr fix when using setup.py 2012-07-05 12:56:29 +02:00
Matthias BUSSONNIER
86788872a8 deactivate 2to3 apply fix when using setup.py 2012-07-05 12:54:17 +02:00
Thomas Kluyver
b43f24da5f Merge pull request #2064 from Carreau/pep-3110
Use new style "except Exception as e" syntax.
2012-07-04 13:50:45 -07:00
Matthias BUSSONNIER
908c4ea8f9 fix english in comment 2012-07-04 13:25:23 +02:00
Matthias BUSSONNIER
86787a3b62 disable some specific 2to3 fixes whith setup.py
this should allow a more compatible codebase between python 2.x and 3.x
2012-07-04 08:35:35 +02:00
Min RK
a7571d1cc7 Merge pull request #2076 from fperez/exclude-static-tests
Skip notebook 'static' dir in test suite.

There's nothing there we should be running python tests on, and
occasionally python files may appear there that cause problems to nose
(e.g. mathjax ships a non-py3 valid conf.py that breaks py3 testing).

Closes #2075
2012-07-01 16:21:51 -07:00
Fernando Perez
22071dfede Skip notebook 'static' dir in test suite.
There's nothing there we should be running python tests on, and
occasionally python files may appear there that cause problems to nose
(e.g. mathjax ships a non-py3 valid conf.py that breaks py3 testing).
2012-07-01 13:14:47 -07:00
Matthias BUSSONNIER
3c743846a7 use full base_url in html and js 2012-07-01 21:59:09 +02:00
Matthias BUSSONNIER
51d715d00a allows password and prefix for notebook
fixes #1997
2012-07-01 12:04:10 +02:00
Fernando Perez
3171c69214 Merge pull request #2068 from minrk/sysinfo
record sysinfo in sdist

closes #2054
2012-06-30 15:57:23 -07:00
MinRK
d2940640f5 record sysinfo in sdist
closes #2054
2012-06-30 15:17:46 -07:00
Fernando Perez
20f3e5812c Merge pull request #2067 from minrk/release_windows
update tools/release_windows.py
2012-06-30 13:49:07 -07:00
MinRK
3b4f48e16d enable uploading wininst to PyPI with tools/release_windows.py
adds upload_wininst command to setup.py
2012-06-30 13:41:30 -07:00
Matthias BUSSONNIER
d85f075ad7 conform to pep 3110
brutally replace all `exeption <type>, <name>:` by
`exception <type> as <name> :`

`exception <type>, <type> :` should not be present anywhere in the code
anymore, or should be present with explicit tuple as
`exception (<type>, <type>)`
2012-06-30 18:34:56 +02:00
Matthias BUSSONNIER
df4192ae2a Allow direct print of the notebook.
this improve the current css of the print page and add css to the
classical notebook with print as target to get a better print view ant
the ability to directly print a notebook without going through the print
view
2012-06-30 13:39:02 +02:00
MinRK
ae177a38cb remove empty IPython.scripts test group 2012-06-30 01:00:56 -07:00
MinRK
abab58c0eb add missing plugin .txt to package_data 2012-06-30 00:51:18 -07:00
MinRK
e75d54a9e3 add Jörgen to mailmap 2012-06-29 17:20:46 -07:00
MinRK
ff3fd0a309 update mailmap 2012-06-29 15:33:12 -07:00
Min RK
24ffbaa28a Merge pull request #1954 from ipython/example_notebooks
example notebooks

Specific content changes from #1570:

* no longer reference left panel
* no longer suggest starting the notebook with `--pylab`, instead favoring `%pylab inline`
* use IPython.display imports

closes #1570
2012-06-28 16:29:37 -07:00
Min RK
e57052b8d8 Merge pull request #2050 from minrk/xunit-quotes
only add quotes around xunit-file on Windows

because it uses os.system. We can trust Popen to handle spaces in the string on other platforms.
2012-06-28 11:25:55 -07:00
MinRK
722e90d50a only add quotes around xunit-file on Windows 2012-06-28 11:23:13 -07:00
MinRK
bc1ea4dfbc rebuild example notebooks
* no longer reference left panel
* no longer suggest starting the notebook with `--pylab`.
2012-06-27 22:31:20 -07:00
Min RK
360e40feca Merge pull request #2047 from minrk/badFirefox
disable auto-scroll on mozilla
2012-06-27 19:57:41 -07:00
Min RK
b8d1bbffaa Merge pull request #2046 from jstenar/iptest-unicode
iptest unicode

- fix space in path issue for iptest when using --with-xunit
- fix unicode issue in path for iptest

closes #760
2012-06-27 15:16:30 -07:00
MinRK
422965cb3d disable auto-scroll on mozilla
see #2041 for details
2012-06-27 15:07:07 -07:00
Jörgen Stenarson
9919f31095 2012-06-27 22:04:54 +02:00
Jörgen Stenarson
13b30ed3c4 2012-06-27 22:03:54 +02:00
Fernando Perez
b68f7f620e Merge pull request #2042 from minrk/scrolltweak
Increase auto-scroll threshold to 100 lines.

It is more important that we not be surprising or annoying than we auto-hide moderately long output.  The manual toggle is always available for intermediate outputs.

Also explicitly ignore shift keydown in our keycode handler, which prevented the sequence:

    <ctrl> M <shift> o

from being recognized, as the shift keypress would reset the control-key state.
2012-06-26 14:44:56 -07:00
MinRK
fae43d51d4 double auto-scroll threshold to 100 lines
it is more important that we not be surprising or annoying than we hide moderately long output.
2012-06-26 14:41:32 -07:00
MinRK
da17f26fbe ignore shift keydown
prevented case-sensitive shortcuts if shift was pressed after control key
2012-06-26 11:41:53 -07:00
Fernando Perez
e39fff880f Merge pull request #2037 from minrk/qtconsole
For Windows installation, remove `ipython-qtconsole` gui-script and simply use `ipython qtconsole`.

QtConsole entry in the Windows Start Menu is updated appropriately.

Closes #1516.
2012-06-25 12:07:47 -07:00
Fernando Perez
efd2c5b2bf Merge pull request #2031 from minrk/confirm
disable ^C^C confirmation on Windows since it uses select.select on stdin, which is illegal on Windows.
2012-06-24 18:17:41 -07:00
MinRK
ab2de249ed disable ^C^C confirmation on Windows 2012-06-24 16:06:12 -07:00
Thomas Kluyver
a81f55cc92 Merge pull request #2016 from jdmarch/quotes-for-test-runner
BUG: test runner fails in Windows if filenames contain spaces.
2012-06-24 07:34:39 -07:00
MinRK
06188412b3 remove ipython-qtconsole gui-script
Always use `ipython qtconsole`

QtConsole entry in the Windows Start Menu is updated appropriately.
2012-06-23 21:32:16 -07:00
Jonathan March
3edd709ab6 BUG: test runner fails in Windows if filenames contain spaces. 2012-06-23 19:55:07 -05:00
Fernando Perez
f6a20e449e Merge pull request #2014 from minrk/profile_re
Relax profile regex in notebook.  Almost any text is a valid profile name, and the previous code only included ascii alphanumeric strings.

closes #2011.
2012-06-23 14:21:51 -07:00