From b1f8037ef49c9b5cbed26e42bca7857cc3c259c2 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 4 Oct 2020 20:59:06 +0200
Subject: [PATCH 1/3] pyinstaller: compute basepath from spec file location

so it does not just run on the vagrant machine, but also everywhere else.
---
 scripts/borg.exe.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/borg.exe.spec b/scripts/borg.exe.spec
index 8c9803c5c..bdde10303 100644
--- a/scripts/borg.exe.spec
+++ b/scripts/borg.exe.spec
@@ -3,7 +3,9 @@
 
 import os, sys
 
-basepath = '/vagrant/borg/borg'
+# Note: SPEC contains the spec file argument given to pyinstaller
+here = os.path.dirname(os.path.abspath(SPEC))
+basepath = os.path.abspath(os.path.join(here, '..'))
 
 block_cipher = None
 

From 3c6133188ac32c765026f1bf68e92dc98521497a Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Mon, 5 Oct 2020 20:33:08 +0200
Subject: [PATCH 2/3] import setuptools first

there is a warning if one imports distutils before setuptools...
---
 setup.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index b1c7daf8f..b1369d151 100644
--- a/setup.py
+++ b/setup.py
@@ -3,14 +3,11 @@ import os
 import io
 import re
 import sys
+import textwrap
 from collections import OrderedDict
 from datetime import datetime
 from glob import glob
 
-from distutils.core import Command
-
-import textwrap
-
 import setup_lz4
 import setup_zstd
 import setup_b2
@@ -65,6 +62,7 @@ if my_python >= (3, 7):
 
 from setuptools import setup, find_packages, Extension
 from setuptools.command.sdist import sdist
+from distutils.core import Command
 from distutils.command.clean import clean
 
 compress_source = 'src/borg/compress.pyx'

From 5cef0a3f07ab6de0c14a6b43b7a15759d54a7147 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Mon, 5 Oct 2020 20:37:52 +0200
Subject: [PATCH 3/3] vagrant: build 3.9.0 via pyenv

---
 Vagrantfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index d54a8c9b0..71b55b376 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -231,6 +231,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.9.0  # tests
     pyenv install 3.5.10  # binary build, use latest 3.5.x release
     pyenv rehash
   EOF
@@ -311,8 +312,8 @@ def run_tests(boxname)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.5.3 3.6.2 3.7.0 3.8.0
-      pyenv local 3.5.3 3.6.2 3.7.0 3.8.0
+      pyenv global 3.5.3 3.6.2 3.7.0 3.8.0 3.9.0
+      pyenv local 3.5.3 3.6.2 3.7.0 3.8.0 3.9.0
     fi
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then