Merge pull request #6135 from ThomasWaldmann/updates-master

some minor updates (master)
This commit is contained in:
TW 2022-01-20 18:26:11 +01:00 committed by GitHub
commit 35cbf473a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

10
Vagrantfile vendored
View file

@ -160,7 +160,7 @@ def install_pythons(boxname)
return <<-EOF
. ~/.bash_profile
pyenv install 3.10.0 # tests, version supporting openssl 1.1
pyenv install 3.9.9 # tests, version supporting openssl 1.1, binary build
pyenv install 3.9.10 # tests, version supporting openssl 1.1, binary build
pyenv install 3.8.0 # tests, version supporting openssl 1.1
pyenv rehash
EOF
@ -179,8 +179,8 @@ def build_pyenv_venv(boxname)
. ~/.bash_profile
cd /vagrant/borg
# use the latest 3.9 release
pyenv global 3.9.9
pyenv virtualenv 3.9.9 borg-env
pyenv global 3.9.10
pyenv virtualenv 3.9.10 borg-env
ln -s ~/.pyenv/versions/borg-env .
EOF
end
@ -229,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.8.0 3.9.9 3.10.0
pyenv local 3.8.0 3.9.9 3.10.0
pyenv global 3.8.0 3.9.10 3.10.0
pyenv local 3.8.0 3.9.10 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:

View file

@ -260,7 +260,7 @@ setup(
license='BSD',
platforms=['Linux', 'MacOS X', 'FreeBSD', 'OpenBSD', 'NetBSD', ],
classifiers=[
'Development Status :: 3 - Alpha',
'Development Status :: 4 - Beta',
'Environment :: Console',
'Intended Audience :: System Administrators',
'License :: OSI Approved :: BSD License',