Merge branch 'master' of https://github.com/napari/magicgui

Author: tlambert03

.github/workflows/test_and_deploy.yml

@@ -1,6 +1,12 @@
 name: tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   test:
@@ -36,9 +42,9 @@ jobs:
         uses: codecov/codecov-action@v1
 
   deploy:
+    if: ${{ github.repository == 'napari/magicgui' && contains(github.ref, 'tags') }}
     needs: test
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'napari/magicgui' && contains(github.ref, 'tags') }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v3.4.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/timothycrosley/isort
+  - repo: https://github.com/PyCQA/isort
     rev: 5.6.4
     hooks:
       - id: isort

tox.ini

@@ -14,19 +14,6 @@ PLATFORM =
     macos-latest: macos
     windows-latest: windows
 
-[testenv:lint]
-deps =
-    flake8
-    flake8-docstrings
-    black==20.8b1
-commands =
-    flake8 magicgui
-    black --check magicgui
-
-[testenv:mypy]
-deps = mypy
-commands = mypy
-
 [testenv]
 platform =
     macos: darwin
@@ -43,3 +30,21 @@ extras =
     pyside: PySide2
 commands =
     pytest -v --cov-report=xml --cov=magicgui --basetemp={envtmpdir} {posargs}
+
+
+[testenv:lint]
+skip_install=true
+deps =
+    flake8==3.8.4
+    isort==5.6.4
+    black==20.8b1
+    flake8-docstrings
+commands =
+    flake8 magicgui
+    black --check magicgui
+    isort --check magicgui
+
+[testenv:mypy]
+skip_install=true
+deps = mypy
+commands = mypy