Commit Graph

8924 Commits

Author SHA1 Message Date
gvaroquaux
5982de9b97 Merge upstream. 2008-09-08 11:33:22 -05:00
Gael Varoquaux
cd169b4e0f Merge with upstream. 2008-09-06 11:58:04 -05:00
Brian Granger
77d11ccc58 This set of changes fixes numerous bugs related to Windows and
the test suite.  At this point all tests should pass or skip
on all the major platforms.  I have also fixed the Windows
post install script, so that it creates .bat and .py files
for all the ip* scripts.
2008-09-06 00:23:26 -07:00
Gael Varoquaux
dad8493832 Merge. 2008-09-02 17:40:39 -05:00
gvaroquaux
177a90b66c Merge with upstream. 2008-09-02 17:02:55 -05:00
Fernando Perez
53c351bdb2 More updates for release of 0.9.rc1. 2008-08-28 17:01:17 -07:00
Fernando Perez
055209bad7 More updates for release of 0.9.rc1.
- Fix links for pyreadline.
- Fix setup.py to include new -wx script.
- Add pylab profile to win32 native installer.
- Fix manual win32 post install script (though this script may not work, and
I'm considering removing it...)
2008-08-28 16:59:55 -07:00
Fernando Perez
791a75ce7c Merge updates for 0.9.rc1 release. 2008-08-28 16:37:27 -07:00
Fernando Perez
41236085a0 Final updates for releasing the 0.9.rc1.
Mostly small tweaks and fixes to the release tools, improved dependency
checking for the documentation build.
2008-08-28 16:34:53 -07:00
Gael Varoquaux
328cd734cc Merge with upstream 2008-08-27 08:49:26 -07:00
Fernando Perez
4fd962d567 Update from upstream. 2008-08-24 00:32:24 -07:00
Fernando Perez
ef5c1bfdd6 Include testing plugin for installation. 2008-08-24 00:03:52 -07:00
Fernando Perez
0567523270 Include testing plugin for installation. 2008-08-24 00:01:59 -07:00
Fernando Perez
96400ae788 Add forgotten file. 2008-08-23 23:38:47 -07:00
Fernando Perez
cc13fca3c2 Add module I forgot 2008-08-23 23:37:40 -07:00
Brian Granger
099de008a4 Skipping a few tests that fail on Windows. 2008-08-23 23:34:39 -07:00
Fernando Perez
92a0ca07e1 Various fixes to testing system and decorators. 2008-08-23 23:31:07 -07:00
Fernando Perez
15ae52f8e6 Fix decorator bug and update build scripts to use setuptools for iptest. 2008-08-23 23:29:56 -07:00
Fernando Perez
044c2de074 Checkpoint before merging with upstream 2008-08-23 23:10:55 -07:00
Brian Granger
3a43439a33 Skipping a few tests related to the wx frontend that fail on Windows. 2008-08-23 22:29:14 -07:00
Brian Granger
93179e9fbe Added tests for the new get_ipython_dir and get_security_dir
functions in genutils.py.  Also added one for get_home_dir.
2008-08-17 15:43:19 -07:00
Brian Granger
a78a37dfa8 Upstream changes. 2008-09-03 13:48:02 -07:00
Brian Granger
e8b8662c91 Upstream changes. 2008-08-24 00:05:37 -07:00
Brian Granger
56a5d4ab91 Upstream changes. 2008-08-23 23:45:22 -07:00
Brian Granger
ce85431b54 Updstream changes. 2008-08-23 23:35:54 -07:00
gvaroquaux
c955929697 Merge with upstream. 2008-08-15 17:04:27 -05:00
Fernando Perez
162df0fc47 Fixes to build/setup machinery.
Lots of changes to setup.py and doc building machinery to ensure we
get all the docs correctly built and installed at the end.
2008-08-15 03:21:15 -07:00
Fernando Perez
5020bb4d11 Fixes to build system. 2008-08-14 19:33:53 -07:00
Fernando Perez
2fc298ac07 Merge with upstream 2008-08-14 01:15:44 -07:00
gvaroquaux
b327410785 Add ipythonx to scripts. 2008-08-12 18:59:57 -05:00
gvaroquaux
89b977c2f7 Add the subpackage to the setupbase.py 2008-08-12 18:12:36 -05:00
gvaroquaux
dee802b42f Add entry point for ipythonx to setup.py, when used with setuptools. 2008-08-12 11:20:30 -05:00
Gael Varoquaux
97f4edd917 Track upstream 2008-07-12 14:03:23 -05:00
Brian E Granger
0e08b770a0 package_data was missing the .txt files in the testing directories. This was causing
the test suite to fail when IPtyhon was installed.  I have modified find_package_data
in setupbase.py to include these files.  Anyone who writes tests that rely on .txt 
files needs to add them to the package_data.
2008-07-01 22:19:24 -06:00
gvaroquaux
5ba683e041 Upstream merges. 2008-06-24 15:09:18 -05:00
Brian E Granger
b31c7b2ebf Temporary fix to get setup.py to not crash. Full fix on the way. 2008-06-12 14:42:36 -06:00
Brian E Granger
50ccdfe646 Merging in ipython-ipython1b branch. This branch was used to merge in the docs from ipython1-dev,
as well as the stuff from the ipython1-sconfig branch.  In addition to simply merging the docs
from ipython1-dev, I have completely reorganized the docs to make the easier to read and write.
2008-06-11 16:08:05 -06:00
Brian E Granger
1c6744d739 Fixing minor typo in setup.py 2008-06-11 16:03:52 -06:00
Brian E Granger
196e82d78d Fixed setupbase.py and MANIFEST.in to reflect all the changes to docs. Currently,
the full tree of our rst docs are not included in the data_files.  Not sure if/how
we want to handle that.  It was easy when we had a single file documentation, but
not we have a full directory hierarchy full of rst files.
2008-06-11 16:01:38 -06:00
Brian E Granger
6b1f778a2d Merging changes from trunk: fix in setupbase.py (ipython->IPython) and missing __init__.py files. 2008-06-10 12:52:59 -06:00
Brian E Granger
cc85cf9653 Fixing a few small bugs in the setup.py scripts. In setupbase.py, in find_scripts, ipython
was spelled as lowercase.  This didn't cause a problem on OS X as it is case insensitive.  But
on Linux, it crashed.  Now ipython is spelled properly as "IPython".  Also, kernel/config/tests
and UserConfig were missing their __init__.py files.  These have been added.
2008-06-10 12:42:32 -06:00
Brian E Granger
30832bbff0 Merge of the ipython-ipython1a branch into the ipython trunk. This merge represents the first
merging of the things in ipython1-dev into ipython.  More specifically, this merge includes
the basic ipython1 kernel and a few related subpackages.  Most importantly, the setup.py
script and friends have been refactored.
2008-06-09 14:02:25 -06:00
Brian E Granger
9dc8fdd5e7 Finished initial reworking and updating of setup.py and friends, including the MANIFEST.in. Everything seems
to work fine. 

I have also gone through the tests in various subpackages (like kernel) and have protected imports of 
twisted, zope.interface and foolscap with a try/except clause.  Now the tests are simply not run
if these deps are missing.  All tests now pass no matter what.
2008-06-08 16:25:02 -06:00
Brian E Granger
d816e04b5f More work fixing some small bugs in the setup.py infrastructure. It is almost working! 2008-06-06 16:59:25 -06:00
Brian E Granger
2593302b59 Adding documentation to setup* files. 2008-06-06 16:24:37 -06:00
Brian E Granger
f27ad5248e Initial work towards refactoring the setup.py scripts to accept the new ipython1 packages
that have been merged.  I am also bringing in a new way for checking dependencies at
build time that is simple, but really helpful now that we have lots of optional
dependencies.
2008-06-06 16:16:36 -06:00
Fernando Perez
db2b6ad91d Merge in all development done in bzr since February 16 2008.
At that time, a clean bzr branch was started from the SVN tree, but
without SVN history.  That SVN history has now been used as the basis
of this branch, and the development done on the history-less BZR
branch has been added and is the content of this merge.  

This branch will be the new official main line of development in
Launchpad (equivalent to the old SVN trunk).
2008-06-01 18:26:30 -07:00
Ville M. Vainio
07ab3cbd74 integrate fernandos 0.8.3 release changes to original trunk 2008-05-29 14:01:03 +03:00
Fernando Perez
427d1da3f5 Finish doc/build tools cleanup.
Fix small stderr flush error in exception reporting.
Final fixes to cpaste to support doctests.
2008-05-28 20:15:04 -07:00
Fernando Perez
f67d122147 Merge 2008-05-27 23:51:45 -07:00