Skip to content

Commit

Permalink
Config and code fixes to pass pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
joshmoore committed Apr 14, 2022
1 parent 0fc7fcc commit 35f9ba6
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 111 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# This workflows will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
---
# This workflows will upload a Python Package using Twine when a release is
# created For more information see:
# https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: tests

on:
on:
push:
branches:
- master
- main
tags:
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
pull_request:
branches:
- master
Expand All @@ -33,8 +35,8 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

# these libraries, along with pytest-xvfb (added in the `deps` in tox.ini),
# enable testing on Qt on linux
# these libraries, along with pytest-xvfb (added in the `deps` in
# tox.ini), enable testing on Qt on linux
- name: Install Linux libraries
if: runner.os == 'Linux'
run: |
Expand Down Expand Up @@ -69,7 +71,7 @@ jobs:

deploy:
# this will run when you have tagged a commit, starting with "v*"
# and requires that you have put your twine API key in your
# and requires that you have put your twine API key in your
# github secrets (see readme for details)
needs: [test]
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repos:
- id: isort

- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
args: [--target-version=py36]
Expand Down Expand Up @@ -60,12 +60,14 @@ repos:
# Conflicts with black: E203 whitespace before ':'
"--ignore=E203",
"--rst-roles=class,func,ref,module,const",
"--exclude=docs/conf.py",
]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.931
hooks:
- id: mypy
exclude: tests/|setup.py|docs/conf.py

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.931
Expand All @@ -75,11 +77,9 @@ repos:
--disallow-untyped-defs,
--ignore-missing-imports,
]
exclude: tests/|setup.py
exclude: tests/|setup.py|docs/conf.py

- repo: https://github.com/adrienverge/yamllint.git
rev: v1.26.3
hooks:
- id: yamllint
# args: [--config-data=relaxed]
#
Loading

0 comments on commit 35f9ba6

Please sign in to comment.