Merge branch 'develop'

* develop: Fix mypy Fix Error retrieving accessibility bus address mypy: fix exception Refactor Travis Fix travis services
NeoVintageous · Dec 15, 2020 · 4961969 · 4961969
2 parents 0e9ab21 + 69195dd
commit 4961969
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,18 +3,17 @@ language: python
 env:
     global:
         - PACKAGE="NeoVintageous"
+        - NO_AT_BRIDGE=1
     matrix:
         - SUBLIME_TEXT_VERSION="3"
 
-services:
-  - xvfb
-
 matrix:
     include:
         - os: linux
-          python: 3.3
           dist: trusty
+          python: 3.3
         - os: linux
+          services: xvfb
           python: 3.8
         - os: osx
           language: generic
@@ -68,12 +67,13 @@ 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;
-            cd "$TRAVIS_BUILD_DIR";
       fi
+    - cd "$TRAVIS_BUILD_DIR";
 
 after_success:
     - coveralls

diff --git 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))