diff options
| author | PJ Eby <distutils-sig@python.org> | 2008-01-19 02:55:03 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2008-01-19 02:55:03 +0000 |
| commit | 60cf2d31c8edb39b418f522ad935320c6da9c927 (patch) | |
| tree | 0b107df453c60f90e6159d58aa56cc2bfcf28225 /setuptools/command/test.py | |
| parent | 7c4938d53774c51b441970e177ce72cc3bdf68ce (diff) | |
| download | external_python_setuptools-60cf2d31c8edb39b418f522ad935320c6da9c927.tar.gz external_python_setuptools-60cf2d31c8edb39b418f522ad935320c6da9c927.tar.bz2 external_python_setuptools-60cf2d31c8edb39b418f522ad935320c6da9c927.zip | |
Fix interactions between the various "require" options,
so that downloads aren't repeated and needed eggs are
always installed, even if they were downloaded to the
setup directory already. (backport from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4060066
Diffstat (limited to 'setuptools/command/test.py')
| -rw-r--r-- | setuptools/command/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/test.py b/setuptools/command/test.py index f8a1169f..db918dae 100644 --- a/setuptools/command/test.py +++ b/setuptools/command/test.py @@ -107,6 +107,8 @@ class test(Command): def run(self): + if self.distribution.install_requires: + self.distribution.fetch_build_eggs(self.distribution.install_requires) if self.distribution.tests_require: self.distribution.fetch_build_eggs(self.distribution.tests_require) @@ -119,8 +121,6 @@ class test(Command): self.with_project_on_sys_path(self.run_tests) - - def run_tests(self): import unittest loader_ep = EntryPoint.parse("x="+self.test_loader) |