From 4b459d8853d089e5d4bb661c0b221cdf032ffdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.com>
Date: Sat, 16 May 2020 19:25:42 +0100
Subject: Move pre-commit checks from Travis CI to a GitHub Action.

This replaces the need for optional execution within the Travis CI
configuration, and updates Mergify to wait on both checks.

Also remove flake8 from pytest on 3.8 since flake8 is already executed in pre-commit.
---
 .github/workflows/pre-commit.yml | 24 ++++++++++++++++++++++++
 .mergify.yml                     |  2 ++
 .travis.yml                      |  3 +--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/pre-commit.yml

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 0000000..1168292
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,24 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019 Anthony Sottile
+#
+# SPDX-License-Identifier: MIT
+
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v1
+    - name: set PY
+      run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
+    - uses: actions/cache@v1
+      with:
+        path: ~/.cache/pre-commit
+        key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+    - uses: pre-commit/action@v1.1.0
diff --git a/.mergify.yml b/.mergify.yml
index 57d396e..63dd7c8 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -7,6 +7,7 @@ pull_request_rules:
     conditions:
       - "#approved-reviews-by>=1"
       - "status-success=Travis CI - Pull Request"
+      - "status-success=pre-commit"
     actions:
       merge:
         method: rebase
@@ -14,6 +15,7 @@ pull_request_rules:
     conditions:
       - "author=Flameeyes"
       - "status-success=Travis CI - Pull Request"
+      - "status-success=pre-commit"
     actions:
       merge:
         method: rebase
diff --git a/.travis.yml b/.travis.yml
index f2f652c..8756a8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
   include:
     - python: 3.7
     - python: 3.8
-      env: PRE_COMMIT=true PYTEST_OPTIONS="--mypy --flake8"
+      env: PYTEST_OPTIONS="--mypy"
     - python: 3.9-dev
 
 install:
@@ -24,4 +24,3 @@ addons:
 
 script:
   - pytest $PYTEST_OPTIONS
-  - if [[ $PRE_COMMIT ]]; then pre-commit run --all-files; fi
-- 
cgit v1.2.3