Skip to content

Commit bea5f2d

Browse files
[pre-commit.ci] pre-commit autoupdate (#71)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Talley Lambert <[email protected]>
1 parent 1efc31b commit bea5f2d

File tree

3 files changed

+29
-38
lines changed

3 files changed

+29
-38
lines changed

Diff for: .github/workflows/test_and_deploy.yml

+9-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: tests
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
410

511
jobs:
612
test:
@@ -35,30 +41,10 @@ jobs:
3541
if: runner.os == 'Linux'
3642
uses: codecov/codecov-action@v1
3743

38-
qa:
39-
runs-on: ubuntu-latest
40-
strategy:
41-
fail-fast: false
42-
matrix:
43-
toxenv: ['lint', 'mypy']
44-
steps:
45-
- uses: actions/checkout@v2
46-
- name: Set up Python 3.8
47-
uses: actions/setup-python@v2
48-
with:
49-
python-version: 3.8
50-
- name: Install tox
51-
run: pip install tox
52-
- name: Test with tox
53-
env:
54-
TOXENV: ${{ matrix.toxenv }}
55-
run: tox
56-
57-
5844
deploy:
59-
needs: [test, qa]
60-
runs-on: ubuntu-latest
6145
if: ${{ github.repository == 'napari/magicgui' && contains(github.ref, 'tags') }}
46+
needs: test
47+
runs-on: ubuntu-latest
6248
steps:
6349
- uses: actions/checkout@v2
6450
- name: Set up Python

Diff for: .pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v3.3.0
3+
rev: v3.4.0
44
hooks:
55
- id: end-of-file-fixer
66
- id: trailing-whitespace
7-
- repo: https://github.com/timothycrosley/isort
7+
- repo: https://github.com/PyCQA/isort
88
rev: 5.6.4
99
hooks:
1010
- id: isort

Diff for: tox.ini

+18-13
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,6 @@ PLATFORM =
1414
macos-latest: macos
1515
windows-latest: windows
1616

17-
[testenv:lint]
18-
deps =
19-
flake8
20-
flake8-docstrings
21-
black==20.8b1
22-
commands =
23-
flake8 magicgui
24-
black --check magicgui
25-
26-
[testenv:mypy]
27-
deps = mypy
28-
commands = mypy
29-
3017
[testenv]
3118
platform =
3219
macos: darwin
@@ -43,3 +30,21 @@ extras =
4330
pyside: PySide2
4431
commands =
4532
pytest -v --cov-report=xml --cov=magicgui --basetemp={envtmpdir} {posargs}
33+
34+
35+
[testenv:lint]
36+
skip_install=true
37+
deps =
38+
flake8==3.8.4
39+
isort==5.6.4
40+
black==20.8b1
41+
flake8-docstrings
42+
commands =
43+
flake8 magicgui
44+
black --check magicgui
45+
isort --check magicgui
46+
47+
[testenv:mypy]
48+
skip_install=true
49+
deps = mypy
50+
commands = mypy

0 commit comments

Comments
 (0)