diff options
| author | kali <kali@leap.se> | 2012-09-06 06:14:07 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-06 06:14:07 +0900 |
| commit | 0932d79369fe381c20f4b8f0260a1cd850d979a7 (patch) | |
| tree | 5fc8f531f54d0f4fe83a2298827e74a03bc296f6 /run_tests.sh | |
| parent | bb5d092b6f57321a12f0d7575e221b0cc68f063d (diff) | |
| parent | 212f9588e458d5c864134caa8dafbef164631671 (diff) | |
Merge branch 'feature/fix-setup-deps' into develop
Closes #405
Several fixes on setup.py:
It now reads requirements from pkg/requirements.pip
Version is extracted from git describe.
Added trove_classifiers metadata.
Added bootstrap for setuptools.
Diffstat (limited to 'run_tests.sh')
| -rwxr-xr-x | run_tests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.sh b/run_tests.sh index ebea30b2..96121d3e 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -39,7 +39,7 @@ function process_option { } venv=.venv -with_venv=setup/tools/with_venv.sh +with_venv=pkg/tools/with_venv.sh always_venv=0 never_venv=0 force=0 @@ -99,14 +99,14 @@ then else if [ $always_venv -eq 1 ]; then # Automatically install the virtualenv - python setup/install_venv.py $installvenvopts + python pkg/install_venv.py $installvenvopts wrapper="${with_venv}" else echo -e "No virtual environment found...create one? (Y/n) \c" read use_ve if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then # Install the virtualenv and run the test suite in it - python setup/install_venv.py $installvenvopts + python pkg/install_venv.py $installvenvopts wrapper=${with_venv} fi fi |