From f9298944b64cb43e735525a28014fa51047d26ca Mon Sep 17 00:00:00 2001
From: Gerard Roche <gerardroche@users.noreply.github.com>
Date: Tue, 15 Dec 2020 06:07:40 +0000
Subject: [PATCH 1/5] Fix travis services

Services are not supported on osx:

    Error message: Services are not supported on osx

On Python 3.3 xvfb is unrecognized:

    Error message: xvfb: unrecognized service

Instead you need run (on Python 3.3):

    export DISPLAY=:99.0;
    sh -e /etc/init.d/xvfb start;
---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b3938654..76ade1aca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,6 @@ env:
     matrix:
         - SUBLIME_TEXT_VERSION="3"
 
-services:
-  - xvfb
-
 matrix:
     include:
         - os: linux
@@ -16,6 +13,7 @@ matrix:
           dist: trusty
         - os: linux
           python: 3.8
+          services: xvfb
         - os: osx
           language: generic
 

From 7a53a689c1bb09ad06aee0871627ce4bf94ea9ef Mon Sep 17 00:00:00 2001
From: Gerard Roche <gerardroche@users.noreply.github.com>
Date: Tue, 15 Dec 2020 06:43:27 +0000
Subject: [PATCH 2/5] Refactor Travis

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76ade1aca..ca1a80bab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,11 @@ env:
 matrix:
     include:
         - os: linux
-          python: 3.3
           dist: trusty
+          python: 3.3
         - os: linux
-          python: 3.8
           services: xvfb
+          python: 3.8
         - os: osx
           language: generic
 
@@ -70,8 +70,8 @@ script:
             else
                 mypy --show-error-codes "../$PACKAGE";
             fi;
-            cd "$TRAVIS_BUILD_DIR";
       fi
+    - cd "$TRAVIS_BUILD_DIR";
 
 after_success:
     - coveralls

From 890d47c9c7085aa67ace16f503a34bd457d7d972 Mon Sep 17 00:00:00 2001
From: Gerard Roche <gerardroche@users.noreply.github.com>
Date: Tue, 15 Dec 2020 07:43:34 +0000
Subject: [PATCH 3/5] mypy: fix exception

---
 nv/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nv/commands.py b/nv/commands.py
index 9e402c2b5..c09eccb21 100644
--- a/nv/commands.py
+++ b/nv/commands.py
@@ -518,7 +518,7 @@ def run(self, key, repeat_count=None, do_eval=True, check_user_mappings=True):
             self._feed_key(key, repeat_count, do_eval, check_user_mappings)
         except Exception as e:
             print('NeoVintageous: An error occurred during key press handle:')
-            _log.exception(e)
+            _log.exception(str(e))
             clean_views()
 
         _log.info('key processed in %s secs', '{:.4f}'.format(time.time() - start_time))

From 6a13ed641ee3da734e0b6af3902a1817830e3e18 Mon Sep 17 00:00:00 2001
From: Gerard Roche <gerardroche@users.noreply.github.com>
Date: Tue, 15 Dec 2020 06:34:35 +0000
Subject: [PATCH 4/5] Fix Error retrieving accessibility bus address

    ** (subl:4442): WARNING **: Error retrieving accessibility bus
    address: org.freedesktop.DBus.Error.ServiceUnknown: The name
    org.a11y.Bus was not provided by any .service files
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ca1a80bab..9849cb14b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 env:
     global:
         - PACKAGE="NeoVintageous"
+        - NO_AT_BRIDGE=1
     matrix:
         - SUBLIME_TEXT_VERSION="3"
 

From 69195dd0aef52b79f108e69bc6e4d239332ac9ed Mon Sep 17 00:00:00 2001
From: Gerard Roche <gerardroche@users.noreply.github.com>
Date: Tue, 15 Dec 2020 07:35:25 +0000
Subject: [PATCH 5/5] Fix mypy

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9849cb14b..7feae436a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,7 +67,8 @@ script:
             find . -type d ! -path "*/\.*" ! -path "./tmp*" ! -path "./htmlcov*" ! -path "./bin*" ! -path "./res*" ! -path "./tests/fixtures*" ! -exec test -f "{}/__init__.pyi" ";" ! -exec test -f "{}/__init__.py" ";" -exec touch "{}/__init__.pyi" ";" -print;
             find . -type f -name __init__.py -print && find . -type f -name __init__.pyi -print;
             if [ "$TRAVIS_PYTHON_VERSION" == "3.3" ]; then
-                mypy "../$PACKAGE";
+                sed -i "/^\(disallow_any_decorated\|disallow_any_explicit\|disallow_any_expr\|disallow_any_generics\|disallow_any_unimported\|no_implicit_reexport\|no_strict_optional\|no_warn_no_return\|strict_equality\|warn_unreachable\)/d" "../$PACKAGE/mypy.ini";
+                mypy "../$PACKAGE" | sed "/No library stub file for standard library module .ctypes./d;/Stub files are from/d;/The return type of .__init__. must be None/d;/Module has no attribute .STARTUPINFO./d;/Module has no attribute .STARTF_USESHOWWINDOW./d;/unused .type. ignore. comment/d;/^$/d" | grep -v "^$" && return 1 || return 0;
             else
                 mypy --show-error-codes "../$PACKAGE";
             fi;