Merge pull request #8700 from ThomasWaldmann/vagrant-updates-master

Vagrant updates master

Vagrantfile

@@ -214,7 +214,7 @@ def install_pythons(boxname)
   return <<-EOF
     . ~/.bash_profile
     echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}"
-    pyenv install 3.12.4  # tests, binary build (3.12.5/6/7 has a broken pip on old macOS)
+    pyenv install 3.12.8
     pyenv rehash
   EOF
 end
@@ -232,8 +232,8 @@ def build_pyenv_venv(boxname)
     . ~/.bash_profile
     cd /vagrant/borg
     # use the latest 3.12 release
-    pyenv global 3.12.4
-    pyenv virtualenv 3.12.4 borg-env
+    pyenv global 3.12.8
+    pyenv virtualenv 3.12.8 borg-env
     ln -s ~/.pyenv/versions/borg-env .
   EOF
 end
@@ -247,6 +247,9 @@ def install_borg(fuse)
     cd borg
     pip install -r requirements.d/development.lock.txt
     python3 scripts/make.py clean
+    # install borgstore WITH sftp support, so it pulls in paramiko also,
+    # so sftp support will also get into the binaries built. #8574
+    pip install borgstore[sftp]
     pip install -e .[#{fuse}]
   EOF
 end
@@ -256,7 +259,7 @@ def install_pyinstaller()
     . ~/.bash_profile
     cd /vagrant/borg
     . borg-env/bin/activate
-    pip install 'pyinstaller==6.10.0'
+    pip install 'pyinstaller==6.11.1'
   EOF
 end
 
@@ -279,8 +282,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.12.4
-      pyenv local 3.12.4
+      pyenv global 3.12.8
+      pyenv local 3.12.8
     fi
     # otherwise: just use the system python
     # some OSes can only run specific test envs, e.g. because they miss FUSE support:

scripts/msys2-install-deps

@@ -2,7 +2,7 @@
 
 pacman -S --needed --noconfirm git mingw-w64-ucrt-x86_64-{toolchain,pkgconf,zstd,lz4,xxhash,openssl,rclone,python-msgpack,python-argon2_cffi,python-platformdirs,python,cython,python-setuptools,python-wheel,python-build,python-pkgconfig,python-packaging,python-pip,python-paramiko}
 python -m pip install --upgrade pip
-pip install pyinstaller==6.10.0
+pip install pyinstaller==6.11.1
 
 if [ "$1" = "development" ]; then
 	pacman -S --needed --noconfirm mingw-w64-ucrt-x86_64-python-{pytest,pytest-benchmark,pytest-cov,pytest-forked,pytest-xdist}