From 245c21fd98d053f61b6c869d6839ad1427fbc201 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 4 Nov 2020 02:01:50 +0100
Subject: [PATCH] adapt to 1.1-maint

---
 .github/workflows/ci.yml | 18 ++++++++++--------
 tox.ini                  |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50b9aa4d9..72dae80a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ 1.1-maint ]
     paths:
     - '**.py'
     - '**.pyx'
@@ -16,7 +16,7 @@ on:
     - 'requirements.d/*'
     - '!docs/**'
   pull_request:
-    branches: [ master ]
+    branches: [ 1.1-maint ]
     paths:
     - '**.py'
     - '**.pyx'
@@ -50,23 +50,26 @@ jobs:
     strategy:
       matrix:
         include:
+            - os: ubuntu-20.04
+              python-version: 3.5
+              toxenv: py35
             - os: ubuntu-20.04
               python-version: 3.6
-              toxenv: py36-fuse2
+              toxenv: py36
             - os: ubuntu-20.04
               python-version: 3.7
-              toxenv: py37-fuse2
+              toxenv: py37
             - os: ubuntu-20.04
               python-version: 3.8
-              toxenv: py38-fuse3
+              toxenv: py38
             - os: ubuntu-20.04
               python-version: 3.9
-              toxenv: py39-fuse3
+              toxenv: py39
             - os: macos-latest
               # note: it seems that 3.8 and 3.9 are currently broken,
               # neverending RuntimeError crashes...
               python-version: 3.7
-              toxenv: py37-fuse2
+              toxenv: py37
 
     env:
       # Configure pkg-config to use OpenSSL from Homebrew
@@ -101,7 +104,6 @@ jobs:
         sudo apt-get install -y libxxhash-dev || true
         sudo apt-get install -y libb2-dev || true
         sudo apt-get install -y libfuse-dev fuse || true  # Required for Python llfuse module
-        sudo apt-get install -y libfuse3-dev fuse3 || true  # Required for Python pyfuse3 module
 
     - name: Install macOS packages
       if: ${{ runner.os == 'macOS' }}
diff --git a/tox.ini b/tox.ini
index e752e0a69..445ca3925 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{35,36,37,38,39},flake8
+envlist = py{35,36,37,38,39}
 
 [testenv]
 deps =