diff options
| author | Jason Kölker <jason@koelker.net> | 2011-12-01 10:34:43 -0600 |
|---|---|---|
| committer | Jason Kölker <jason@koelker.net> | 2011-12-01 10:34:43 -0600 |
| commit | 6bf56a0d259792d179ff02425bfb96d420b794bb (patch) | |
| tree | 14857cc7afe99f89709632e083a33d88f7d2e941 /tools | |
| parent | a4fb90f3e343c36cc8b3e60a5a3580ee273eae62 (diff) | |
| download | oslo-6bf56a0d259792d179ff02425bfb96d420b794bb.tar.gz oslo-6bf56a0d259792d179ff02425bfb96d420b794bb.tar.xz oslo-6bf56a0d259792d179ff02425bfb96d420b794bb.zip | |
Only list requirements in the setup.py like it should be
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 11 | ||||
| -rw-r--r-- | tools/pip-requires | 12 |
2 files changed, 4 insertions, 19 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 6e92378..c73943f 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -90,13 +90,10 @@ def create_virtualenv(venv=VENV): print 'done.' -def install_dependencies(venv=VENV): - print 'Installing dependencies with pip (this can take a while)...' - - # Install greenlet by hand - just listing it in the requires file does not - # get it in stalled in the right order +def install_package(venv=VENV): + print 'Installing packages (this can take a while)...' venv_tool = 'tools/with_venv.sh' - run_command([venv_tool, 'pip', 'install', '-E', venv, '-r', PIP_REQUIRES], + run_command([venv_tool, 'pip', 'install', '-E', venv, '-e', ROOT], redirect_output=False) # Tell the virtual env how to "import openstack-common" @@ -140,7 +137,7 @@ def print_help(): def main(argv): check_dependencies() create_virtualenv() - install_dependencies() + install_package() print_help() if __name__ == '__main__': diff --git a/tools/pip-requires b/tools/pip-requires deleted file mode 100644 index a0f3dd4..0000000 --- a/tools/pip-requires +++ /dev/null @@ -1,12 +0,0 @@ -greenlet>=0.3.1 -pep8==0.6.1 -pylint==0.19 -eventlet>=0.9.12 -PasteDeploy -routes -webob==1.0.8 -nose -nose-exclude -bzr -webtest -lxml==2.3 |