Browse Source

Enable Python3.9 env for test suite and VMs (#5373)

for now, skip fuse for py39 -- llfuse does not support py39 yet

use brew update >/dev/null so travis does not complain about too much output
pamaron 4 years ago
parent
commit
8be6afd9e1
5 changed files with 25 additions and 14 deletions
  1. 12 4
      .travis.yml
  2. 9 7
      .travis/install.sh
  3. 2 2
      Vagrantfile
  4. 1 0
      setup.py
  5. 1 1
      tox.ini

+ 12 - 4
.travis.yml

@@ -15,18 +15,26 @@ matrix:
           os: linux
           dist: xenial
           env: TOXENV=py37
-        - python: "3.8"
-          os: linux
-          dist: xenial
-          env: TOXENV=py38
         - python: "3.7-dev"
           os: linux
           dist: xenial
           env: TOXENV=py37
+        - python: "3.8"
+          os: linux
+          dist: xenial
+          env: TOXENV=py38
         - python: "3.8-dev"
           os: linux
           dist: xenial
           env: TOXENV=py38
+        - python: "3.9-dev"
+          os: linux
+          dist: xenial
+          env: TOXENV=py39 SKIPFUSE=true
+        - python: "3.9-dev"
+          os: linux
+          dist: focal
+          env: TOXENV=py39 SKIPFUSE=true
         - python: "3.6"
           os: linux
           dist: xenial

+ 9 - 7
.travis/install.sh

@@ -11,9 +11,8 @@ then
 
     # Update brew itself
     export HOMEBREW_NO_AUTO_UPDATE=1  # Auto-updating everything would take too much time
-    brew update
+    brew update > /dev/null
     brew cleanup  # Preempt possible scheduled clean-up so it doesn't clutter the log later
-
     # Install and/or upgrade dependencies
     #brew install zstd || brew upgrade zstd  # Installation takes very long due to CMake dependency and isn't necessary for the tests as borg comes bundled with zstd anyway
     brew install lz4 || brew upgrade lz4
@@ -63,14 +62,17 @@ python -m pip install virtualenv
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
 
+# Install requirements
+pip install -r requirements.d/development.txt
+pip install codecov
+python setup.py --version
+
 # Recent versions of OS X don't allow kernel extensions which makes the osxfuse tests fail; those versions are marked with SKIPFUSE=true in .travis.yml
 if [ "${SKIPFUSE}" = "true" ]
 then
     truncate -s 0 requirements.d/fuse.txt
+    pip install -e .
+else
+    pip install -e .[fuse]
 fi
 
-# Install requirements
-pip install -r requirements.d/development.txt
-pip install codecov
-python setup.py --version
-pip install -e .[fuse]

+ 2 - 2
Vagrantfile

@@ -220,10 +220,10 @@ def run_tests(boxname)
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then
       echo "Running tox WITH fakeroot -u"
-      fakeroot -u tox --skip-missing-interpreters -e py36,py37,py38
+      fakeroot -u tox --skip-missing-interpreters -e py36,py37,py38,py39
     else
       echo "Running tox WITHOUT fakeroot -u"
-      tox --skip-missing-interpreters -e py36,py37,py38
+      tox --skip-missing-interpreters -e py36,py37,py38,py39
     fi
   EOF
 end

+ 1 - 0
setup.py

@@ -269,6 +269,7 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
     ],

+ 1 - 1
tox.ini

@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{35,36,37,38},flake8
+envlist = py{35,36,37,38,39},flake8
 
 [testenv]
 deps =