Skip to content

Commit 343a9f9

Browse files
committed
fix #60 by setting install_requires instead of requires
1 parent 085120a commit 343a9f9

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
2010-12-26 Doug Hellmann <[email protected]>
22

3+
* setup.py: Change "requires" to "install_requires" so pip will
4+
try to install virtualenv if it is not already there.
5+
36
* virtualenvwrapper.sh (virtualenvwrapper_get_python_version): Use
47
python's -V option and cut to get the version instead of a python
58
one-liner.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def find_package_data(
138138
provides=['virtualenvwrapper',
139139
'virtualenvwrapper.user_scripts',
140140
],
141-
requires=['virtualenv'],
141+
install_requires=['virtualenv'],
142142

143143
namespace_packages = [ 'virtualenvwrapper' ],
144144
packages = find_packages(),

tests/manual_test_install.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ VERSION=$(python setup.py --version)
1313
oneTimeSetUp() {
1414
rm -rf "$WORKON_HOME"
1515
mkdir -p "$WORKON_HOME"
16-
mkvirtualenv "installtest"
17-
(cd "$test_dir/.." && make sdist)
1816
}
1917

2018
oneTimeTearDown() {
@@ -25,6 +23,12 @@ setUp () {
2523
echo
2624
}
2725

26+
test_build_ok () {
27+
(cd "$test_dir/.." && make sdist)
28+
outcome=$?
29+
assertSame "0" "$outcome"
30+
}
31+
2832
test_install () {
2933
dist_dir=$(dirname $test_dir)/dist
3034
pip install "$dist_dir/virtualenvwrapper-$VERSION.tar.gz"

0 commit comments

Comments
 (0)