From 53ab22a3b36f0769e9812362ba46f3664757a179 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 1 Mar 2019 15:35:15 +0100 Subject: [PATCH 1/5] vagrant: upgrade py 3.6.7 -> 3.6.8 --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 874fd0ddb..5ddf192b0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -112,7 +112,7 @@ def install_pythons(boxname) pyenv install 3.7.0 # tests pyenv install 3.6.0 # tests pyenv install 3.5.0 # tests - pyenv install 3.6.7 # binary build, use latest 3.6.x release + pyenv install 3.6.8 # binary build, use latest 3.6.x release pyenv rehash EOF end @@ -130,8 +130,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.6 release - pyenv global 3.6.7 - pyenv virtualenv 3.6.7 borg-env + pyenv global 3.6.8 + pyenv virtualenv 3.6.8 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end From eb0869a4f6348dee1eb9f1d3fd6c80a96535042f Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 1 Mar 2019 15:36:48 +0100 Subject: [PATCH 2/5] vagrant: upgrade py 3.5.0 -> 3.5.3 due to openssl 1.1 compatibility --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 5ddf192b0..4f1f8ede9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -111,7 +111,7 @@ def install_pythons(boxname) . ~/.bash_profile pyenv install 3.7.0 # tests pyenv install 3.6.0 # tests - pyenv install 3.5.0 # tests + pyenv install 3.5.3 # tests, 3.5.3 is first to support openssl 1.1 /dev/null; then # for testing, use the earliest point releases of the supported python versions: - pyenv global 3.5.0 3.6.0 3.7.0 - pyenv local 3.5.0 3.6.0 3.7.0 + pyenv global 3.5.3 3.6.0 3.7.0 + pyenv local 3.5.3 3.6.0 3.7.0 fi # otherwise: just use the system python if which fakeroot 2> /dev/null; then From e549333bd5bef6cb0b5f45defd0ba51b018420de Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 1 Mar 2019 15:38:06 +0100 Subject: [PATCH 3/5] vagrant: upgrade osxfuse 3.8.2 -> 3.8.3 --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 4f1f8ede9..3a0a95f8d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -75,9 +75,9 @@ def packages_darwin sudo softwareupdate --ignore "Install macOS High Sierra" sudo softwareupdate --install --all # get osxfuse 3.x release code from github: - curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.8.2/osxfuse-3.8.2.dmg >osxfuse.dmg + curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.8.3/osxfuse-3.8.3.dmg >osxfuse.dmg MOUNTDIR=$(echo `hdiutil mount osxfuse.dmg | tail -1 | awk '{$1="" ; print $0}'` | xargs -0 echo) \ - && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for macOS 3.8.2.pkg" -target / + && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for macOS 3.8.3.pkg" -target / sudo chown -R vagrant /usr/local # brew must be able to create stuff here ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew update From 08574d08f8ac0852c97c8a11cf7f8a566c92aea3 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 1 Mar 2019 15:41:52 +0100 Subject: [PATCH 4/5] vagrant: darwin: add zstd --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index 3a0a95f8d..197e24ef7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -82,6 +82,7 @@ def packages_darwin ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew update brew install openssl + brew install zstd brew install lz4 brew install xz # required for python lzma module brew install fakeroot From cecea99a0e3d8ba957dee1015e1dfdcb44b47643 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 1 Mar 2019 15:44:30 +0100 Subject: [PATCH 5/5] vagrant: darwin: upgrade OS 10.10 -> 10.12 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 197e24ef7..dd74c5799 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -288,7 +288,7 @@ Vagrant.configure(2) do |config| end config.vm.define "darwin64" do |b| - b.vm.box = "jhcook/yosemite-clitools" + b.vm.box = "jhcook/macos-sierra" b.vm.provider :virtualbox do |v| v.memory = 1536 + $wmem v.customize ['modifyvm', :id, '--ostype', 'MacOS1010_64']