diff --git a/requirements.txt b/requirements.txt index 924db05f..cd9bd04f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ fusepy==2.0.2 -pygit2==0.22.0 +pygit2==0.23.3 six==1.10.0 atomiclong diff --git a/script/provision b/script/provision old mode 100644 new mode 100755 index 5bdb979f..7a685538 --- a/script/provision +++ b/script/provision @@ -3,12 +3,14 @@ echo I am provisioning... sudo sh -c 'date > /etc/vagrant_provisioned_at' sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q python-software-properties -sudo add-apt-repository ppa:presslabs/gitfs +sudo add-apt-repository ppa:presslabs/gitfs-dev +sudo add-apt-repository ppa:fkrull/deadsnakes sudo apt-get update -sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q python-virtualenv python-dev libffi-dev build-essential libgit2-dev git-core python3.4-dev +sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q python-virtualenv python-dev libffi-dev build-essential git-core python3.5-dev libgit2-dev sudo adduser "$USER" fuse +sudo pip install -U virtualenv sudo sh -c "echo 'user_allow_other' >> /etc/fuse.conf" -virtualenv -q --setuptools /home/vagrant/gitfs -ppython3.4 +virtualenv -q --setuptools -ppython3.5 /home/vagrant/gitfs echo "source $HOME/gitfs/bin/activate" >> "$HOME/.bashrc" echo Installing cffi /home/vagrant/gitfs/bin/pip install -q 'cffi' diff --git a/script/test b/script/test index c385fcb6..d1433bba 100755 --- a/script/test +++ b/script/test @@ -9,7 +9,7 @@ export REPO_NAME="$REPO_NAME" export MOUNT_PATH="$MNT_DIR" export REPO_PATH="$REPO_DIR" export REMOTE="$REMOTE" -"$VIRTUAL_ENV/bin/py.test" --cov --cov-config .coveragerc "$TESTS" +"$VIRTUAL_ENV/bin/py.test" --assert=plain --cov --cov-config .coveragerc "$TESTS" kill -9 "$(cat "$GITFS_PID")" sudo umount -f "$MNT_DIR" rm -rf "$TEST_DIR"