e10677aaff
Merging upstream changes from inputhook branch.
...
These changes are being propagated from trunk->module-reorg->inputhook
to me.
17 years ago
5f4dfb3d53
Merging upstream change from module-reorg branch.
...
Recently lp:ipython was merged into module-reorg. This is propagating
that merge into this inputhook branch.
17 years ago
d2126ac322
Merging -r 1196 from lp:ipython.
...
A couple of issues came up:
* Some tests in testing and frontend rely on twisted, but are being
tested with nose. This is bad! We currently have hackish logic in
iptest to skip these if twisted is not installed, but if it is we
are testing them with nose!
* Some modules (engineservice, kernel/error, newserialized) have nose
skip logic even though they should never be tested with nose.
* When trial is run on testStrictDict we get an uncaught error.
testStrictDict ... ERROR: An unexpected error occurred while tokenizing
input The following traceback may be corrupted or invalid
The error message is: ('EOF in multi-line statement', (37, 0))
17 years ago
61cc720e11
Merging -r 1192 from lp:ipython.
17 years ago
551b819cd4
Merging -r 1185 from lp:ipython.
17 years ago
2f50493d06
Fixes so the test suite runs when Twisted is not available.
...
Other minor cleanups (formatting and unused imports)
17 years ago
6b0c7134ef
Merging -r 1180 from lp:ipthon
...
No conflicts!
17 years ago
acc15a048b
Merging -r 1177 from lp:ipython with fixes and resolutions.
...
The main conflicts I had to fix were in ultratb. I have removed
the ultraTB.py in IPython/kernel/core. Now IPython/core/ultratb.py
is being used everywhere. Also I have protected the calls to ipapi.get
to see if None is returned. This happens when trial IPython.kernel
is run.
17 years ago
f64ae7afe9
Make iptest more reliable under Win32.
...
This ensures the trial part of the tests runs in win32.
17 years ago
5826bcce9a
[bug] Close debian bugs: remove debian/ dir and add missing man pages.
...
This closes the bugs:
https://bugs.launchpad.net/ipython/+bug/291143
https://bugs.launchpad.net/ipython/+bug/368719
The manpages were contributed by Debian's Stephan Peijnik, and lightly
edited to update them with current trunk functionality.
17 years ago
b7d773553d
Update setup and support tools to include new man pages.
17 years ago
7a98356a91
Merging a number of recent bug fixes in preparation for the 0.10 release.
...
No new features were introduced, but many test failures and a few bugs were
fixed. In particular, closes:
https://bugs.launchpad.net/ipython/+bug/362137
17 years ago
0331faae06
Small fixes for wx-dependent tests and include clearcmd.
...
Check that wx.aui can be imported and otherwise exclude modules that use it to
avoid errors when loading the test suite.
Also, do load clearcmd so that the tests for %clear do work.
17 years ago
a76420c74e
Merging upstream changes.
17 years ago
4e709cd95d
Updated iptest to skip inputhook*.py files for doctesting.
17 years ago
255992e5ae
Merging upstream from module-reorg.
17 years ago
58e345c261
Refactored iptest.py to work with new package org.
...
In the process I had to fix 2 small bugs to get all the tests passing.
17 years ago
6221939722
Renaming Extensions=>extensions in code and imports.
17 years ago
f50040feec
Fixing a few bugs to get the win32 installer working again.
17 years ago
7b495ced75
Fixing installation related issues.
17 years ago
f53e35c98b
UserConfig => config/userconfig and imports updated.
17 years ago
629dabdeab
upgrade_dir.py => utils/upgradedir.py and updated imports.
17 years ago
8bdec3ecc8
ultraTB.py => core/ultratb.py and imports updated.
17 years ago
a522e6f6fd
Shell.py => core/shell.py and imports updated.
17 years ago
7c088ae84a
Release.py => core/release.py and imports updated.
17 years ago
c2b67757f4
Prompts.py => core/prompts.py and imports updated.
17 years ago
d24aa6729d
All platutils modules to utils, moved tests and updated imports.
17 years ago
a86437a272
OutputTrap.py => core/outputtrap.py and updated imports.
17 years ago
96372896a0
OInspect.py => core/oinspect.py and imports updated.
17 years ago
93ff33a755
Magic.py => core/magic.py and imports updated.
17 years ago
9e7706b8e8
irunner.py => lib/irunner.py and imports updated.
17 years ago
84df0f39f7
Fixing the setup.py script under setuptools and the __init__.py script.
17 years ago
6f8009d88f
Logger.py => core/logger.py and updated imports.
17 years ago
d4c01d0407
FakeModule.py => core/fakemodule.py and updated tests and imports.
17 years ago
32a5e3041d
deep_reload.py =? lib/deepreload.py and imports updated.
17 years ago
8221c8f920
Debugger.py => core/debugger.py and updated all imports.
17 years ago
d0a609940a
CrashHandler.py => core/crashhandler.py and updated all imports.
17 years ago
6bc203735a
ConfigLoader.py => config/configloader.py and updated all imports.
17 years ago
bfd32c129b
background_jobs.py => lib/backgroundjob.py and imports updated.
17 years ago
f6061ca275
ColorANSI.py -> utils/coloransi.py and all imports updated.
17 years ago
6f98f68331
Merging upstream
17 years ago
fba8740c1d
Merging with upstream
17 years ago
ed8ff9e4e0
Fixing small bug in iptest. Can now be run as "iptest".
17 years ago
97e13855e1
Merging bugfixes0411409 branch.
...
This branch has a massive number of bug fixes.
17 years ago
386c262e44
Merging changes from above.
17 years ago
ff41bf1dc6
Added platutils.get_long_path_name to expand paths with "~" on win32.
...
This might be needed to fix ticket https://bugs.launchpad.net/bugs/366353
But, there are still problems with Magic.parse_options
17 years ago
f97df71460
Adding comment about ticket https://bugs.launchpad.net/bugs/366982
17 years ago
e6a9e402ff
More fixes for testing on win32.
17 years ago
db440afb0f
Fixing tests in IPython.testing.
17 years ago
e18c04f33a
Fixing bugs with the testing system.
17 years ago
Brian Granger
Fernando Perez
Administrator