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

Vagrant updates (master)

Vagrantfile

@@ -163,7 +163,7 @@ def install_pythons(boxname)
   return <<-EOF
     . ~/.bash_profile
     pyenv install 3.10.0  # tests, version supporting openssl 1.1
-    pyenv install 3.9.12  # tests, version supporting openssl 1.1, binary build
+    pyenv install 3.9.13  # tests, version supporting openssl 1.1, binary build
     pyenv rehash
   EOF
 end
@@ -181,8 +181,8 @@ def build_pyenv_venv(boxname)
     . ~/.bash_profile
     cd /vagrant/borg
     # use the latest 3.9 release
-    pyenv global 3.9.12
-    pyenv virtualenv 3.9.12 borg-env
+    pyenv global 3.9.13
+    pyenv virtualenv 3.9.13 borg-env
     ln -s ~/.pyenv/versions/borg-env .
   EOF
 end
@@ -206,10 +206,7 @@ def install_pyinstaller()
     . ~/.bash_profile
     cd /vagrant/borg
     . borg-env/bin/activate
-    git clone https://github.com/thomaswaldmann/pyinstaller.git
-    cd pyinstaller
-    git checkout v4.7-maint
-    python setup.py install
+    pip install 'pyinstaller==4.10'
   EOF
 end
 
@@ -232,8 +229,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.12 3.10.0
-      pyenv local 3.9.12 3.10.0
+      pyenv global 3.9.13 3.10.0
+      pyenv local 3.9.13 3.10.0
     fi
     # otherwise: just use the system python
     # some OSes can only run specific test envs, e.g. because they miss FUSE support:

requirements.d/development.lock.txt

@@ -1,13 +1,13 @@
-setuptools==60.7.1
+setuptools==62.1.0
 setuptools-scm==6.4.2
-pip==22.0.3
-virtualenv==20.13.0
+pip==22.1.2
+virtualenv==20.14.1
 pkgconfig==1.5.5
-tox==3.24.5
-pytest==7.0.0
+tox==3.25.0
+pytest==7.0.1
 pytest-xdist==2.5.0
 pytest-cov==3.0.0
 pytest-benchmark==3.4.1
-Cython==0.29.27
+Cython==0.29.30
 twine==3.8.0
 python-dateutil==2.8.2