From dd070c05c99187da4bbf70cc1813245cb883a5e6 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 18 Apr 2020 21:48:04 +0200 Subject: [PATCH 1/3] vagrant: fix debianoid virtualenv packages there is no python-virtualenv on focal64, but "virtualenv" installs everything needed. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 5f8bb9da4..3da90d89e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,7 +20,7 @@ def packages_debianoid(user) chgrp fuse /dev/fuse chmod 666 /dev/fuse apt install -y fakeroot build-essential git curl - apt install -y python3-dev python3-setuptools python-virtualenv python3-virtualenv + apt install -y python3-dev python3-setuptools virtualenv # for building python: apt install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev libffi-dev EOF From 49e21b2754f37ab7b49b89ce36a61c93c4a8cec8 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 18 Apr 2020 22:59:13 +0200 Subject: [PATCH 2/3] vagrant: fixes for freebsd 12.1 --- Vagrantfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3da90d89e..4bd638b3f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -46,11 +46,9 @@ def packages_freebsd pkg install -y liblz4 zstd fusefs-libs pkgconf pkg install -y git bash # fakeroot causes lots of troubles on freebsd # for building python: - pkg install -y sqlite3 - pkg install -y py27-virtualenv # provides "virtualenv" command - pkg install -y python36 py36-virtualenv py36-pip + pkg install -y python37 py37-sqlite3 py37-virtualenv py37-pip # make sure there is a python3 command - ln -s /usr/local/bin/python3.6 /usr/local/bin/python3 + ln -sf /usr/local/bin/python3.7 /usr/local/bin/python3 # make bash default / work: chsh -s bash vagrant mount -t fdescfs fdesc /dev/fd From c75a7e41564efbaca0dbe6ef30de91df7412bf71 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 18 Apr 2020 23:01:24 +0200 Subject: [PATCH 3/3] pyinstaller: work around issue with setuptools > 44 see https://github.com/pypa/setuptools/issues/1963 --- scripts/borg.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/borg.exe.spec b/scripts/borg.exe.spec index 93b3503af..451f86dfc 100644 --- a/scripts/borg.exe.spec +++ b/scripts/borg.exe.spec @@ -13,7 +13,7 @@ if is_win32: hiddenimports = [] else: basepath = '/vagrant/borg/borg' - hiddenimports = ['borg.platform.posix'] + hiddenimports = ['borg.platform.posix', 'pkg_resources.py2_warn', ] block_cipher = None