Merge pull request #368 from pre-commit/azure_pipelines

azure pipelines [skip travis] [skip appveyor]

Author: asottile

.coveragerc

@@ -6,7 +6,6 @@ omit =
     .tox/*
     /usr/*
     setup.py
-    get-git-lfs.py
 
 [report]
 show_missing = True

.travis.yml

@@ -1,9 +1,8 @@
-[![Build Status](https://travis-ci.org/pre-commit/pre-commit-hooks.svg?branch=master)](https://travis-ci.org/pre-commit/pre-commit-hooks)
-[![Coverage Status](https://coveralls.io/repos/github/pre-commit/pre-commit-hooks/badge.svg?branch=master)](https://coveralls.io/github/pre-commit/pre-commit-hooks?branch=master)
-[![Build status](https://ci.appveyor.com/api/projects/status/dfcpng35u4g0r0t1/branch/master?svg=true)](https://ci.appveyor.com/project/asottile/pre-commit-hooks/branch/master)
+[![Build Status](https://asottile.visualstudio.com/asottile/_apis/build/status/pre-commit.pre-commit-hooks?branchName=master)](https://asottile.visualstudio.com/asottile/_build/latest?definitionId=17&branchName=master)
+[![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/asottile/asottile/17/master.svg)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=17&branchName=master)
 
 pre-commit-hooks
-==========
+================
 
 Some out-of-the-box hooks for pre-commit.
 

README.md

@@ -0,0 +1,25 @@
+trigger:
+  branches:
+    include: [master, test-me-*]
+
+resources:
+  repositories:
+    - repository: asottile
+      type: github
+      endpoint: asottile-github
+      name: asottile/azure-pipeline-templates
+      ref: refs/tags/v0.0.8
+
+jobs:
+- template: job--python-tox.yml@asottile
+  parameters:
+    toxenvs: [py27, py37]
+    os: windows
+    pre_test:
+    - script: git lfs
+- template: job--python-tox.yml@asottile
+  parameters:
+    toxenvs: [pypy, py27, py36, py37]
+    os: linux
+    pre_test:
+    - script: git lfs

appveyor.yml

@@ -24,8 +24,6 @@ def cmd_output(*cmd, **kwargs):  # type: (*str, **Any) -> str
     proc = subprocess.Popen(cmd, **kwargs)
     stdout, stderr = proc.communicate()
     stdout = stdout.decode('UTF-8')
-    if stderr is not None:
-        stderr = stderr.decode('UTF-8')
     if retcode is not None and proc.returncode != retcode:
         raise CalledProcessError(cmd, retcode, proc.returncode, stdout, stderr)
     return stdout

azure-pipelines.yml

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import subprocess
+import distutils.spawn
 
 import pytest
 
@@ -67,8 +67,7 @@ def test_integration(temp_git_dir):
 
 
 def has_gitlfs():
-    output = cmd_output('git', 'lfs', retcode=None, stderr=subprocess.STDOUT)
-    return 'git lfs status' in output
+    return distutils.spawn.find_executable('git-lfs') is not None
 
 
 xfailif_no_gitlfs = pytest.mark.xfail(

get-git-lfs.py

@@ -22,7 +22,7 @@ def f1_is_a_conflict_file(tmpdir):
     cmd_output('git', 'init', '--', repo1.strpath)
     with repo1.as_cwd():
         repo1_f1.ensure()
-        cmd_output('git', 'add', '--', repo1_f1.strpath)
+        cmd_output('git', 'add', '.')
         cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'commit1')
 
     cmd_output('git', 'clone', repo1.strpath, repo2.strpath)
@@ -77,7 +77,7 @@ def repository_pending_merge(tmpdir):
     cmd_output('git', 'init', repo1.strpath)
     with repo1.as_cwd():
         repo1_f1.ensure()
-        cmd_output('git', 'add', '--', repo1_f1.strpath)
+        cmd_output('git', 'add', '.')
         cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'commit1')
 
     cmd_output('git', 'clone', repo1.strpath, repo2.strpath)
@@ -90,7 +90,7 @@ def repository_pending_merge(tmpdir):
     # Commit in clone and pull without committing
     with repo2.as_cwd():
         repo2_f2.write('child\n')
-        cmd_output('git', 'add', '--', repo2_f2.strpath)
+        cmd_output('git', 'add', '.')
         cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'clone commit2')
         cmd_output('git', 'pull', '--no-commit', '--no-rebase')
         # We should end up in a pending merge

pre_commit_hooks/util.py

@@ -1,5 +1,4 @@
 [tox]
-# These should match the travis env list
 envlist = py27,py36,py37,pypy3
 
 [testenv]