From 6063c21bd93b002762b591bc0d1320a2ecc8b3f0 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 1 Jun 2022 19:48:10 +0200 Subject: [PATCH 1/3] vagrant: use python 3.9.13 for binary build --- Vagrantfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e4567db65..9a7d0ed7d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -157,7 +157,7 @@ def install_pythons(boxname) return <<-EOF . ~/.bash_profile pyenv install 3.10.0 # tests, version supporting openssl 1.1 - pyenv install 3.9.10 # tests, version supporting openssl 1.1, binary build + pyenv install 3.9.13 # tests, version supporting openssl 1.1, binary build pyenv install 3.8.0 # tests, version supporting openssl 1.1 pyenv rehash EOF @@ -176,8 +176,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.9 release - pyenv global 3.9.10 - pyenv virtualenv 3.9.10 borg-env + pyenv global 3.9.13 + pyenv virtualenv 3.9.13 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.8.0 3.9.10 3.10.0 - pyenv local 3.8.0 3.9.10 3.10.0 + pyenv global 3.8.0 3.9.13 3.10.0 + pyenv local 3.8.0 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: From 6b9a66b5fa1c5951110eaec8ff9c7cd3f8306105 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 1 Jun 2022 19:49:37 +0200 Subject: [PATCH 2/3] vagrant: use pyinstaller 4.10 when installed via pip, this automatically build the bootloader now. --- Vagrantfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 9a7d0ed7d..f6dec2f84 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -201,10 +201,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 From 354b014b191f30c26423632072d129a6d6876a85 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 1 Jun 2022 19:51:55 +0200 Subject: [PATCH 3/3] vagrant/testing: upgrade development.lock.txt esp. the Cython version upgrade to 0.29.30 is important for python 3.11. --- requirements.d/development.lock.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt index ef1c219a5..131097e7d 100644 --- a/requirements.d/development.lock.txt +++ b/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