Commit Graph

1375 Commits

Author SHA1 Message Date
Nick Tarleton
097fddbadd Add missing external.pexpect to packages 2011-03-30 08:13:15 -07:00
Thomas Kluyver
1205d8f66e Merge branch 'unicode-issues' 2011-03-24 23:54:23 +00:00
Thomas Kluyver
becb566a6f Tweak code with suggestions from yesterday. 2011-03-24 23:42:04 +00:00
Robert Kern
943edf4cf9 Remove check for GTK in tests, so that the default encoding remains ascii, and Unicode failures can be resolved. 2011-03-24 19:33:06 +00:00
Fernando Perez
bd5f429aae Merge branch 'ready_unbundle' of https://github.com/tomspur/ipython into tomspur-ready_unbundle 2011-03-23 19:14:28 -07:00
Thomas Spura
0cc0201b33 Move pretty into lib, because it's heavily changed now. 2011-03-13 14:30:08 +01:00
Thomas Spura
3ea19b0740 Unbundle of all external modules.
Move all libraries in external into subfolders and place a custom
__init__.py into each of them. This way the system installed ones are
tried first, before falling back to the bundled ones.

Now every distribution can properly depend on the upstream library.
(e.g. bundled libraries are not allowed in fedora)

Signed-off-by: Toshio Ernie Kuratomi <toshio@fedoraproject.org>
Signed-off-by: Thomas Spura <tomspur@fedoraproject.org>
2011-03-13 14:28:25 +01:00
MinRK
66e0d22bec gave logo harder, cleaner edges 2011-02-10 12:42:24 -08:00
Brian Granger
4ef2dc7f98 Merge branch 'ellisonbg-payload' into trunk 2011-01-23 21:30:53 -08:00
Brian Granger
3ced248d86 Lots of work on the display system, focused on pylab stuff.
* Moved the pprint attribute to PlainTextFormatter.
* Added DisplayFormatter.plain_text_only for disabling all but the
  plain text formatting. This is now used by doctest_mode.
* Remove result_display hook.
* Fixed doctest_mode magic.
* Refactored inline matplotlib backend to use new display system.
* Added display formatter for matplotlib.figure.Figure objects.
  so the display system will show the svg for them.
* Added display and display_png to the user's namespace in pylab.
* Cleaned up pylabtools.py
2011-01-23 21:29:41 -08:00
MinRK
faa07c36f3 added gh-pages command for GitHub hosted sphinx docs 2011-01-02 16:00:59 -08:00
Fernando Perez
e83ac2aa73 Merge branch 'windows-workdir' of http://github.com/darrendale/ipython into darrendale-windows-workdir 2010-11-02 23:44:04 -07:00
Darren Dale
8e91a9d0d9 fix windows post-installation routines with setuptools installed 2010-11-02 16:18:29 -04:00
Fernando Perez
0d8b493329 Merge branch 'version-info' into trunk 2010-10-29 20:29:16 -07:00
Fernando Perez
992e40df2e Fix bug in our specification of data_files.
As best I can tell, we've been mis-specifying data_files for ages.
For some reason with a plain setup.py it worked fine, but using a
customized cmdclass for build_py, the error shows up.

The problem was that we were returning a list of triples for
data_files, and the spec clearly says they must be pairs:

http://docs.python.org/distutils/setupscript.html?highlight=data_files#installing-additional-files
2010-10-27 00:16:56 -07:00
Fernando Perez
5a0edd6c04 Complete support of git commit info with IPython.sys_info().
This will give us an easy way for users to report platform details,
without trying to cram lots of data into the version string.

Now, the version information in release.py is simple and doesn't
attempt to read version control data at runtime.  We expose sys_info()
as a top-level function so it's very easy to remember/direct for new
users.

Minor doc/copyright notices updates in the same files.
2010-10-26 23:19:36 -07:00
Fernando Perez
18de03a2f6 Small fixes to git ignore file 2010-10-26 23:19:35 -07:00
Fernando Perez
a1fa49b9d4 Add support for commit information in auto-generated archives.
This uses the tool to record the commit data from our previous commit,
and ensures that auto-generated archives from Github, for example,
always carry identifying information.

Ideas and code taken from Matthew Brett's tools in nibabel.
2010-10-26 23:19:35 -07:00
Fernando Perez
89a6713551 Add utility to record commit information in archives/tarballs.
Thanks to Matthew Brett for the contribution (taken from nibabel).

Also, minor cleanups and updates for 2.6/3.x.
2010-10-26 23:19:35 -07:00
Fernando Perez
da1557f1c0 Fix invalid version check in setup.py. 2010-10-26 16:48:15 -07:00
Fernando Perez
8921529206 Merge branch 'logo-fix' of http://github.com/eteq/ipython into trunk 2010-10-26 00:22:03 -07:00
Erik Tollerud
14db36cf37 added logo to sphinx documentation 2010-10-24 18:36:05 -07:00
Fernando Perez
3c50c7ece3 Merge branch 'takowl-ipy3-preparation' into trunk
This branch cleans up our trunk to make a 2to3 run be as painless as
possible, while keeping our code fully 2.6-compatible.

Closes gh-159 (pull request).
2010-10-10 13:13:38 -07:00
Thomas Kluyver
495d7316f3 Ignore .bak files 2010-10-10 13:08:49 -07:00
Thomas Kluyver
365896cd23 Ignore .py~ files 2010-10-10 13:08:48 -07:00
Fernando Perez
f759524310 Fix name of entry script for setuptools. 2010-09-28 16:16:50 -07:00
Fernando Perez
ca9a81f9b5 Merge branch 'newkernel' into trunk with all new Qt console work.
This provides a new main script, ipython-qtconsole, that offers a rich
Qt widget capable of multiline editing, inline plots, html help and
much more.

This branch was developed over the last two months mostly by Evan
Patterson, Brian Granger and Fernando Perez, thanks to the support of
Enthought, Inc.

The code is now in a good prototype stage, and it's being merged into
trunk where further work, polishing and stabilization will take place.
2010-09-28 16:12:40 -07:00
Fernando Perez
f609fd80a3 Rename entry point for Qt console to ipython-qtconsole.
This was the name we came up with on-list; also put all entry points
in IPython/scripts/ as discussed.
2010-09-28 16:11:20 -07:00
epatters
2b63052424 Update setup.py for setuptools support for ipythonqt script. 2010-09-02 15:56:52 -05:00
Fernando Perez
56ede30647 Add ipythonqt script to main list of user-installed scripts. 2010-09-02 13:40:29 -07:00
epatters
a631f0fc1e Updated setupbase.py to include zmq.pylab package. 2010-08-31 17:21:40 -05:00
epatters
3ef5b1de92 Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend
Conflicts:
	IPython/frontend/qt/console/frontend_widget.py
	IPython/frontend/qt/console/ipython_widget.py
	IPython/zmq/ipkernel.py
2010-08-19 09:33:09 -05:00
Brian Granger
29259fc441 Refactor of prompts and the displayhook.
* Renamed CachedOutput to displayhook.DisplayHook.
* Added methods that DisplayHook.__call__ uses to do its work.
  These methods can now be overridden for the ZMQ kernel.
* Removed all hooks (result_display and generate_output_prompt)
  that the outputcache was using. We need to add these back in
  once we figure out what to do about hooks in general.
2010-08-17 18:38:39 -07:00
epatters
8b42896342 Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend
Conflicts:
	IPython/zmq/pykernel.py
2010-08-17 12:56:45 -05:00
Brian Granger
30627d74a5 Moving and renaming in preparation of subclassing InteractiveShell.
* IPython/scripts/ipython -> IPython/frontend/terminal/scripts
* IPython.core.ipapp -> IPython.frontend.terminal.ipapp
* IPython.core.embed -> IPython.frontend.terminal.embed
* IPython.core.iplib -> IPython.core.interactiveshell
2010-08-12 15:40:30 -07:00
epatters
567d5b5952 Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py.
Conflicts:
	setupbase.py
2010-07-29 09:11:36 -05:00
Fernando Perez
2e8acf77e2 Finish cleanup of setup.py and tests after dead code removal.
This completes the cleanup from Brian's previous commits, so that
trunk again installs/tests correctly.
2010-07-27 13:52:54 -07:00
epatters
557abf30aa Updated setupbase.py to reflect new 'frontend.qt' and 'zmq' packages. 2010-07-23 16:48:34 -05:00
Brian Granger
a46f74f371 Adding .gitignore and updating release to remove bzr tag. 2010-05-13 15:34:15 -07:00
Brian Granger
5dae9f5f49 Merging Fernando's trunk (fp-trunk-dev) and Brian's edits (fp-review).
This is a huge merge of months worth of work by Fernando and Brian.

Some highlights:

* The test suite has been ported to use the new APIs.
* The test suite runs and passes on all platforms!!!
* The IPython Sphinx directive has been updated to use the new APIs.
* %history works again.
* New %tb magic for showing last traceback.
* Significant design improvements in the config loaders and applications.
* Zillions of bugs fixed.
* Completely new %pylab implementation that uses the new GUI support.
  This allows pylab to be enabled *at runtime*.
* Many other things.
2010-01-31 15:30:13 -08:00
Brian Granger
9d00d5e3da Minor cleanup in iptest.py and growl.py. 2010-01-31 12:06:20 -08:00
Brian Granger
ba5e56c49f Removed the top-level iptest.py and INSTALLED logic.
Fernando's branch introduced the ability to run the test suite
from a top-level iptest.py script. This allowed IPython to be tested
without installation. The implementation was fragile and we also
decided that we *want* people to install IPython as part of testing
it, so we removed this feature.
2010-01-30 19:43:46 -08:00
Brian Granger
e5b30872ed More work addressing review comments for Fernando's branch.
* :mod:`IPython.testing.globalipapp` now directly creates a
  :class:`~IPython.core.iplib.InteractiveShell` instance by passing it a
  configuration object, rather than creating an IPython application.
* Updated everything in :mod:`IPython.frontend` and :mod:`IPython.gui` to use
  raw :class:`~IPython.core.iplib.InteractiveShell directly rather than
  creating an IPython application.
* Updated the IPython sphinx extension to use raw
  :class:`~IPython.core.iplib.InteractiveShell directly rather than creating
  an IPython application.
* Removed code from :mod:`IPython.extensions.pretty` that called
  :func:`get_ipython` (r1271).
* Addressed comment on (r1284) about holding refs to deferreds in
  :mod:`IPython.kernel.ipclusterapp`.
* Removed :mod:`IPython.kernel` from list of modules tested by nose in
  :mod:`IPython.testing.iptest`. (r1318)
2010-01-29 21:01:10 -08:00
Brian Granger
e24997b0ba Work to address the review comments on Fernando's branch.
* Added comment about Magic(object) (r1224)
* Moved InteractiveTB.set_mode from IPythonApp -> InteractiveShell (r1229)
* Moved pylabtools.py to IPython/lib (r1229)
* Cleaned up comments and copyrights in testing (r1233)
* Added comment about ip.shell._ofind (r1237)
* Removed "Bye." from quitter (r1240).
* Refactored and removed :mod:`IPython.utils.genutils` and
  :mod:`IPython.utils.platutils`. These modules have been replaced by topical
  focused modules in :mod:`IPython.utils`.
* Refactored tests in :mod:`IPython.utils.tests`.
* Moved :func:`IPython.testing.tools.temp_pyfile` to :mod:`IPython.utils.io`.
* Moved :func:`IPython.testing.tools.cmd2argv` to
  :func:`IPython.testing.tools.pycmd2argv` and documented the fact that this
  only works with Python based command line programs.
* Created a new :func:`IPython.utils.path.get_ipython_module_path` to use
  in finding paths to IPython modules.
2010-01-29 16:24:13 -08:00
Fernando Perez
8965698c56 Added diagnostics printout at the end of the test suite.
This will make it easier for us to understand problem reports from users.
2010-01-17 14:36:19 -08:00
Fernando Perez
e1ea030504 Robustness fixes in test suite machinery.
Added a module-level INSTALLED flag, which can be set to false if the test
suite is being run in-place (without ipython having been installed at all).
This is because how we call and import things must be done differently
depending on whether the code is installed or is being run in-place.  The
only ones that can know this reliably are the entry-point scripts, so those
are responsible for setting this flag.

Also made the code that validates ipython in subprocesses report errors
better, by checking stderr for errors before validating stdout output, as
anything on stderr will be likely informative of the real problem.
2010-01-17 13:13:21 -08:00
Fernando Perez
4041a88063 Inform user at install time of minimal python requirements if not met.
Fixes: https://bugs.launchpad.net/ipython/+bug/505090
2010-01-16 16:57:22 -08:00
Fernando Perez
ecff1e9e39 Make the test suite runnable without X11 connections.
This fix makes the test suite work in settings like a screen session that
can import but not initialize GTK.
2010-01-16 14:50:08 -08:00
Fernando Perez
5740081c62 Fix tests to return consistent results regardless of how they are called.
Now, calling:

- 'python iptest.py' from source dir or from src/IPython/testing should give
the same results

- 'python iptest.py IPython.SOMETHING' from either place should also give
the same results.
2010-01-16 14:43:41 -08:00
Fernando Perez
34dd139174 Fixes to make test suite more robust on Fedora.
I fond some spurious warnings on Fedora, extra noise on stdout and other
small problems this commit fixes.

The test suite now runs cleanly on Fedora11 without Twisted available.
2010-01-15 14:41:10 -08:00