From ef2188b7caa1530e63a3585fc1d2a33f15ef9532 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 1 Oct 2022 23:01:27 +0200 Subject: [PATCH 1/5] increase VMCPUS and xdistn to 16 --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e1dfddd10..1617c4276 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,8 +3,8 @@ # Automated creation of testing environments / binaries on misc. platforms -$cpus = Integer(ENV.fetch('VMCPUS', '4')) # create VMs with that many cpus -$xdistn = Integer(ENV.fetch('XDISTN', '4')) # dispatch tests to that many pytest workers +$cpus = Integer(ENV.fetch('VMCPUS', '16')) # create VMs with that many cpus +$xdistn = Integer(ENV.fetch('XDISTN', '16')) # dispatch tests to that many pytest workers $wmem = $xdistn * 256 # give the VM additional memory for workers [MB] def packages_debianoid(user) From 6034d90996fa61486910ffa8b08f550293cbd46a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 1 Oct 2022 23:06:38 +0200 Subject: [PATCH 2/5] vagrant: use python 3.9.14 for binary build --- Vagrantfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 1617c4276..78788a065 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -161,7 +161,7 @@ def install_pythons(boxname) return <<-EOF . ~/.bash_profile pyenv install 3.10.2 # tests, version supporting openssl 1.1 - pyenv install 3.9.13 # tests, version supporting openssl 1.1, binary build + pyenv install 3.9.14 # tests, version supporting openssl 1.1, binary build pyenv rehash EOF end @@ -179,8 +179,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.9 release - pyenv global 3.9.13 - pyenv virtualenv 3.9.13 borg-env + pyenv global 3.9.14 + pyenv virtualenv 3.9.14 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end @@ -227,8 +227,8 @@ def run_tests(boxname, skip_env) . ../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.9.13 3.10.2 - pyenv local 3.9.13 3.10.2 + pyenv global 3.9.14 3.10.2 + pyenv local 3.9.14 3.10.2 fi # otherwise: just use the system python # some OSes can only run specific test envs, e.g. because they miss FUSE support: From 420ca419610a5aa3292a4965a67aef85c37f733b Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 1 Oct 2022 23:13:05 +0200 Subject: [PATCH 3/5] vagrant: add python 3.11.0rc2 --- Vagrantfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 78788a065..92ec41736 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -160,8 +160,9 @@ end def install_pythons(boxname) return <<-EOF . ~/.bash_profile - pyenv install 3.10.2 # tests, version supporting openssl 1.1 - pyenv install 3.9.14 # tests, version supporting openssl 1.1, binary build + pyenv install 3.11.0rc2 # tests + pyenv install 3.10.2 # tests + pyenv install 3.9.14 # tests, binary build pyenv rehash EOF end @@ -227,8 +228,8 @@ def run_tests(boxname, skip_env) . ../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.9.14 3.10.2 - pyenv local 3.9.14 3.10.2 + pyenv global 3.9.14 3.10.2 3.11.0rc2 + pyenv local 3.9.14 3.10.2 3.11.0rc2 fi # otherwise: just use the system python # some OSes can only run specific test envs, e.g. because they miss FUSE support: From fa83fa1c2316e0b574863b8320e3d059c2634c8c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 2 Oct 2022 01:32:13 +0200 Subject: [PATCH 4/5] vagrant: upgrade pyinstaller 4.10 -> 5.4.1 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 92ec41736..209200990 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -205,7 +205,7 @@ def install_pyinstaller() . ~/.bash_profile cd /vagrant/borg . borg-env/bin/activate - pip install 'pyinstaller==4.10' + pip install 'pyinstaller==5.4.1' EOF end From 8221afe9653474f85422ddbee550a57191b05a56 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 2 Oct 2022 01:33:57 +0200 Subject: [PATCH 5/5] use absolute import to make pyinstaller binaries work again --- src/borg/__main__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/borg/__main__.py b/src/borg/__main__.py index 16279fc8d..a561b79b0 100644 --- a/src/borg/__main__.py +++ b/src/borg/__main__.py @@ -11,6 +11,7 @@ if sys.platform.startswith("win32"): os.environ["PATH"] = os.pathsep.join(dll_path) + os.pathsep + os.environ["PATH"] -from .archiver import main +# note: absolute import from "borg", it seems pyinstaller binaries do not work without this. +from borg.archiver import main main()