Commit Graph

142 Commits

Author SHA1 Message Date
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
Ville M. Vainio
16cc23ec97 docs: remove build crap from sdist with manifest.in 2008-05-22 21:57:52 +03:00
Ville M. Vainio
1e114fb69e fix do_sphinx running in setup.py 2008-05-22 21:11:35 +03:00
Ville M. Vainio
9e716ec99b Updated setup.py and do_sphinx.py for new manual distribution 2008-05-22 19:44:30 +03:00
Fernando Perez
c73766b963 Local commit before merge 2008-05-08 13:36:32 -07:00
ville
826c6d262e setup.py: use package_data to grab UserConfig files, install UserConfig as normal package 2008-05-03 19:06:46 +03:00
Fernando Perez
41db6089b6 Merge upstream 2008-04-09 13:10:34 -07:00
ldufrechou
fb442f6dca Added gui and gui.wx to setup.py 2008-03-29 10:31:30 +01:00
Fernando Perez
3eb24f919e Update permissions 2008-03-09 22:00:33 -07:00
Ville M. Vainio
8da9a47841 more crlf 2008-02-28 20:30:23 +02:00
ville
e0f395f6a1 initialization (no svn history) 2008-02-16 11:50:47 +02:00
vivainio
b6582cdfa1 remove all datafiles from the egg 2007-08-13 17:51:26 +00:00
vivainio
594f9bfab3 revert setup.py accidental checkin 2007-05-23 12:03:38 +00:00
vivainio
fe093d3d81 %store for macros works again 2007-05-23 11:59:41 +00:00
fperez
806a650327 - Merge changes from 0.8.1 branch that hadn't made it to trunk from the past
few days.
- In particular, add Gael's nice physical constants module.
- Apply fix for igrid help files in setup, and other minor setup cleanups.
- Update release numbers for 0.8.2 development.
2007-05-10 06:05:24 +00:00
jdh2358
52139e9577 - Final commits for 0.8.0 tag.
- Missing part of win32 install patch by N. Pernetty that I'd inadvertedly
  not applied.
  
- Unicode fixes for emacs under win32

- Small bug fix (recently introduced) in pycolorize.

- Improve handling of history file after %run, reduces memory usage.
2007-04-08 02:48:16 +00:00
walter.doerwald
5c3939f715 Add the igrid help files to the list of data files
to be installed alongside igrid.
2007-03-16 14:17:47 +00:00
vivainio
bbb4fae13e Do not croak ungracefully when running setup.py w/o args 2006-11-21 20:32:14 +00:00
walter.doerwald
0fc6fcf2a9 Add IPython.external to the package list. 2006-11-03 17:50:22 +00:00
fperez
1bcb3a2b5e Add irunner to the scripts list, I'd forgotten it. 2006-06-02 08:22:01 +00:00
vivainio
e03df277e6 adding docs to egg because of problems in win32 easy_install == dev 2006-02-03 07:35:45 +00:00
vivainio
1828f32116 changed setup to support easy_install ipython==dev 2006-02-01 19:29:22 +00:00
fperez
614fa9e90e - Fairly significant changes to include Vivian's patches for improved pdb
support.  Her original idea was kept in full, code reworked for compactness
and better integration with the rest of ipython.

- Added download_url arg to setup.py to support setuptools.
2005-12-25 00:57:24 +00:00
fperez
e7c9387f26 Updated manpage and docs to clarify negated options usage. Thanks to Stefan
van der Walt for the heads-up.
2005-12-01 18:14:21 +00:00
fperez
ad18848364 Reorganized the directory for ipython/ to have its own dir, which is a bit
more consistent with the SVN book recommended layout.
2005-07-06 17:52:32 +00:00