upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 01:41:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #6738 from ThomasWaldmann/vagrant-updates-1.2

Browse source 
Vagrant updates (1.2-maint)
This commit is contained in:
TW 2022-06-01 20:19:55 +02:00 committed by GitHub
commit 03827bc684
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Vagrantfile vendored
View file

@ -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
@ -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
@ -227,8 +224,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:

12
requirements.d/development.lock.txt
View file

@ -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