From 3313b4f9c3c5d6a579588e77068ca3ae3edffe2b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 25 Jan 2021 14:26:08 +0100
Subject: Adding upstream version 0.15.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Vagrantfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'Vagrantfile')

diff --git a/Vagrantfile b/Vagrantfile
index 7684c1a..f913248 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,18 +7,19 @@ INSTALL_DEPS=<<EOF
 cd /vagrant
 sudo add-apt-repository -y ppa:deadsnakes/ppa
 sudo apt-get update
-sudo apt-get install -y --allow-unauthenticated python2.7-dev python3.5-dev python3.6-dev python3.7-dev python3.8-dev python3.9-dev
+sudo apt-get install -y --allow-unauthenticated python3.6-dev python3.7-dev python3.8-dev python3.9-dev
 sudo apt-get install -y --allow-unauthenticated python3.8-distutils python3.9-distutils # Needed to work around python3.8/9+virtualenv issue
-sudo apt-get install -y python-virtualenv git ipython python-pip python3-pip silversearcher-ag jq
+sudo apt-get install -y git python3-pip ripgrep jq
 sudo apt-get install -y build-essential libssl-dev libffi-dev # for rebuilding cryptography (required for pypy2)
-sudo apt-get purge -y python3-virtualenv
-sudo pip3 install virtualenv
+sudo apt-get install -y python3-pip
+pip3 install -U pip
+pip3 install 'virtualenv!=20.1.0'
 
 ./run_tests.sh --uninstall --envs all
 ./run_tests.sh --install --envs all
 
 grep 'cd /vagrant' /home/vagrant/.bashrc || echo 'cd /vagrant' >> /home/vagrant/.bashrc
-grep 'source .venv27/bin/activate' /home/vagrant/.bashrc || echo 'source .venv27/bin/activate' >> /home/vagrant/.bashrc
+grep 'source .venv36/bin/activate' /home/vagrant/.bashrc || echo 'source .venv36/bin/activate' >> /home/vagrant/.bashrc
 EOF
 
 INSTALL_JENKINS=<<EOF
@@ -31,7 +32,7 @@ EOF
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-    config.vm.box = "ubuntu/xenial64"
+    config.vm.box = "ubuntu/focal64"
 
     config.vm.define "dev" do |dev|
         dev.vm.provision "gitlint", type: "shell", inline: "#{INSTALL_DEPS}"
-- 
cgit v1.2.3