Merge pull request #5388 from ThomasWaldmann/backports

Backports from 1.2.0a9 release PR

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

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
 

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
@@ -60,6 +57,7 @@ extras_require = {
 
 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'