Merge branch 'master' of github.com:PIQuIL/QuCumber

PIQuIL · Dec 1, 2020 · cf36827 · cf36827
2 parents d2588a7 + 896482e
commit cf36827
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.mergify.yml b/.mergify.yml
@@ -4,6 +4,7 @@ pull_request_rules:
       - author=renovate[bot]
       - status-success=Travis CI - Pull Request
       - status-success=continuous-integration/appveyor/pr
+      - label=merge-on-success
     actions:
       merge:
         strict: smart+fasttrack

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.18.0
+    rev: v2.7.4
     hooks:
     - id: pyupgrade
       args: [--py36-plus]