Skip to content

Vagrant fixes #5349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 3 commits into from
Sep 25, 2020
Merged

Vagrant fixes #5349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8e9f85
vagrant: add libffi-dev, required to build python
ThomasWaldmann Sep 25, 2020
6deb756
use cryptography<3.0, more recent versions break jessie box
ThomasWaldmann Sep 25, 2020
595bfca
use python 3.5.10 for binary build
ThomasWaldmann Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def packages_debianoid(user)
apt-get install -y fakeroot build-essential git
apt-get install -y python3-dev python3-setuptools
# 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 libffi-dev
# this way it works on older dists (like ubuntu 12.04) also:
# for python 3.2 on ubuntu 12.04 we need pip<8 and virtualenv<14 as
# newer versions are not compatible with py 3.2 any more.
Expand Down Expand Up @@ -49,7 +49,7 @@ def packages_redhatted
# needed to compile msgpack-python (otherwise it will use slow fallback code):
yum install -y gcc-c++
# for building python:
yum install -y zlib-devel bzip2-devel ncurses-devel readline-devel xz xz-devel sqlite-devel
yum install -y zlib-devel bzip2-devel ncurses-devel readline-devel xz xz-devel sqlite-devel libffi-devel
#yum install -y python-pip
#pip install virtualenv
EOF
Expand Down Expand Up @@ -83,7 +83,7 @@ def packages_freebsd
pkg install -y openssl liblz4 fusefs-libs pkgconf
pkg install -y git bash
# for building python:
pkg install -y sqlite3
pkg install -y sqlite3 libffi
# make bash default / work:
chsh -s bash vagrant
mount -t fdescfs fdesc /dev/fd
Expand Down Expand Up @@ -230,7 +230,7 @@ def install_pythons(boxname)
pyenv install 3.6.2 # tests
pyenv install 3.7.0 # tests
pyenv install 3.8.0 # tests
pyenv install 3.5.9 # binary build, use latest 3.5.x release
pyenv install 3.5.10 # binary build, use latest 3.5.x release
pyenv rehash
EOF
end
Expand All @@ -248,8 +248,8 @@ def build_pyenv_venv(boxname)
. ~/.bash_profile
cd /vagrant/borg
# use the latest 3.5 release
pyenv global 3.5.9
pyenv virtualenv 3.5.9 borg-env
pyenv global 3.5.10
pyenv virtualenv 3.5.10 borg-env
ln -s ~/.pyenv/versions/borg-env .
EOF
end
Expand Down
2 changes: 2 additions & 0 deletions requirements.d/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ setuptools
setuptools_scm
pip
virtualenv
# newer cryptography does not build in the jessie vagrant boxes
cryptography<3.0
tox
pytest
pytest-xdist
Expand Down