Vagrantfile: remove python 3.2, use older pip/venv for trusty

pyenv installs latest virtualenv/pip that is not compatible with py 3.2 any more

I did a local python 3.2 tox run - it works.
This commit is contained in:
Thomas Waldmann 2016-01-23 22:10:42 +01:00
parent f4561e813f
commit 74a9e8d52d
1 changed files with 5 additions and 4 deletions

9
Vagrantfile vendored
View File

@ -28,8 +28,10 @@ def packages_debianoid
# for building python: # for building python:
apt-get install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev apt-get install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev
# this way it works on older dists (like ubuntu 12.04) also: # this way it works on older dists (like ubuntu 12.04) also:
easy_install3 pip # for python 3.2 on ubuntu 12.04 we need pip<8 and virtualenv<14 as
pip3 install virtualenv # newer versions are not compatible with py 3.2 any more.
easy_install3 'pip<8.0'
pip3 install 'virtualenv<14.0'
touch ~vagrant/.bash_profile ; chown vagrant ~vagrant/.bash_profile touch ~vagrant/.bash_profile ; chown vagrant ~vagrant/.bash_profile
EOF EOF
end end
@ -158,7 +160,6 @@ end
def install_pythons(boxname) def install_pythons(boxname)
return <<-EOF return <<-EOF
. ~/.bash_profile . ~/.bash_profile
pyenv install 3.2.2 # tests, 3.2(.0) and 3.2.1 deadlock, issue #221
pyenv install 3.3.0 # tests pyenv install 3.3.0 # tests
pyenv install 3.4.0 # tests pyenv install 3.4.0 # tests
pyenv install 3.5.0 # tests pyenv install 3.5.0 # tests
@ -249,7 +250,7 @@ def run_tests(boxname)
. ../borg-env/bin/activate . ../borg-env/bin/activate
if which pyenv > /dev/null; then if which pyenv > /dev/null; then
# for testing, use the earliest point releases of the supported python versions: # for testing, use the earliest point releases of the supported python versions:
pyenv global 3.2.2 3.3.0 3.4.0 3.5.0 pyenv global 3.3.0 3.4.0 3.5.0
fi fi
# otherwise: just use the system python # otherwise: just use the system python
if which fakeroot > /dev/null; then if which fakeroot > /dev/null; then