azure pipelines [skip travis] [skip appveyor]

asottile · asottile · commit 9c6edab726b1 · 2019-04-28T21:39:06.000-07:00
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.org/pre-commit/pre-commit.svg?branch=master)](https://travis-ci.org/pre-commit/pre-commit)
-[![Coverage Status](https://coveralls.io/repos/github/pre-commit/pre-commit/badge.svg?branch=master)](https://coveralls.io/github/pre-commit/pre-commit?branch=master)
-[![Build status](https://ci.appveyor.com/api/projects/status/mmcwdlfgba4esaii/branch/master?svg=true)](https://ci.appveyor.com/project/asottile/pre-commit/branch/master)
+[![Build Status](https://dev.azure.com/asottile/asottile/_apis/build/status/asottile.pyupgrade?branchName=master)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=21&branchName=master)
+[![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/asottile/asottile/21/master.svg)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=21&branchName=master)
 
 ## pre-commit
 
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -0,0 +1,50 @@
+trigger:
+  branches:
+    include: [master, test-me-*]
+  tags:
+    include: ['*']
+
+resources:
+  repositories:
+    - repository: asottile
+      type: github
+      endpoint: github
+      name: asottile/azure-pipeline-templates
+      ref: refs/tags/v0.0.13
+
+jobs:
+- template: job--pre-commit.yml@asottile
+- template: job--python-tox.yml@asottile
+  parameters:
+    toxenvs: [py27, py37]
+    os: windows
+    additional_variables:
+      COVERAGE_IGNORE_WINDOWS: '# pragma: windows no cover'
+      TOX_TESTENV_PASSENV: COVERAGE_IGNORE_WINDOWS
+      TEMP: C:\Temp  # remove when dropping python2
+    pre_test:
+    - template: step--rust-install.yml
+- template: job--python-tox.yml@asottile
+  parameters:
+    toxenvs: [py37]
+    os: linux
+    name_postfix: _latest_git
+    pre_test:
+    - task: UseRubyVersion@0
+    - template: step--git-install.yml
+    - template: step--rust-install.yml
+    - bash: |
+        testing/get-swift.sh
+        echo '##vso[task.prependpath]/tmp/swift/usr/bin'
+      displayName: install swift
+- template: job--python-tox.yml@asottile
+  parameters:
+    toxenvs: [pypy, pypy3, py27, py36, py37]
+    os: linux
+    pre_test:
+    - task: UseRubyVersion@0
+    - template: step--rust-install.yml
+    - bash: |
+        testing/get-swift.sh
+        echo '##vso[task.prependpath]/tmp/swift/usr/bin'
+      displayName: install swift
diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py
@@ -23,7 +23,7 @@ def _envdir(prefix, version):
     return prefix.path(directory)
 
 
-def get_env_patch(venv):
+def get_env_patch(venv):  # pragma: windows no cover
     if sys.platform == 'cygwin':  # pragma: no cover
         _, win_venv, _ = cmd_output('cygpath', '-w', venv)
         install_prefix = r'{}\bin'.format(win_venv.strip())
@@ -41,12 +41,14 @@ def get_env_patch(venv):
 
 
 @contextlib.contextmanager
-def in_env(prefix, language_version):
+def in_env(prefix, language_version):  # pragma: windows no cover
     with envcontext(get_env_patch(_envdir(prefix, language_version))):
         yield
 
 
-def install_environment(prefix, version, additional_dependencies):
+def install_environment(
+        prefix, version, additional_dependencies,
+):  # pragma: windows no cover
     additional_dependencies = tuple(additional_dependencies)
     assert prefix.exists('package.json')
     envdir = _envdir(prefix, version)
@@ -72,6 +74,6 @@ def install_environment(prefix, version, additional_dependencies):
             )
 
 
-def run_hook(hook, file_args):
+def run_hook(hook, file_args):  # pragma: windows no cover
     with in_env(hook.prefix, hook.language_version):
         return helpers.run_xargs(hook, helpers.to_cmd(hook), file_args)
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
@@ -109,15 +109,15 @@ def norm_version(version):
         if _sys_executable_matches(version):
             return sys.executable
 
+        version_exec = _find_by_py_launcher(version)
+        if version_exec:
+            return version_exec
+
         # Try looking up by name
         version_exec = find_executable(version)
         if version_exec and version_exec != version:
             return version_exec
 
-        version_exec = _find_by_py_launcher(version)
-        if version_exec:
-            return version_exec
-
         # If it is in the form pythonx.x search in the default
         # place on windows
         if version.startswith('python'):
diff --git a/testing/util.py b/testing/util.py
@@ -30,8 +30,8 @@ def cmd_output_mocked_pre_commit_home(*args, **kwargs):
 
 
 skipif_cant_run_docker = pytest.mark.skipif(
-    docker_is_running() is False,
-    reason='Docker isn\'t running or can\'t  be accessed',
+    os.name == 'nt' or not docker_is_running(),
+    reason="Docker isn't running or can't  be accessed",
 )
 
 skipif_cant_run_swift = pytest.mark.skipif(
diff --git a/tests/xargs_test.py b/tests/xargs_test.py
@@ -145,7 +145,7 @@ def test_argument_too_long():
 def test_xargs_smoke():
     ret, out, err = xargs.xargs(('echo',), ('hello', 'world'))
     assert ret == 0
-    assert out == b'hello world\n'
+    assert out.replace(b'\r\n', b'\n') == b'hello world\n'
     assert err == b''
 
 
diff --git a/tox.ini b/tox.ini
@@ -1,20 +1,19 @@
 [tox]
-project = pre_commit
-# These should match the travis env list
-envlist = py27,py36,py37,pypy
+envlist = py27,py36,py37,pypy,pypy3,pre-commit
 
 [testenv]
 deps = -rrequirements-dev.txt
-passenv = LOCALAPPDATA
+passenv = HOME LOCALAPPDATA
 commands =
     coverage erase
     coverage run -m pytest {posargs:tests}
     coverage report --fail-under 100
-    pre-commit run --all-files
+    pre-commit install
 
-[testenv:venv]
-envdir = venv-{[tox]project}
-commands =
+[testenv:pre-commit]
+skip_install = true
+deps = pre-commit
+commands = pre-commit run --all-files --show-diff-on-failure
 
 [pep8]
 ignore = E265,E501,W504

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ def cmd_output_mocked_pre_commit_home(args, *kwargs):`
`30`	`30`
`31`	`31`
`32`	`32`	`skipif_cant_run_docker = pytest.mark.skipif(`
`33`		`- docker_is_running() is False,`
`34`		`- reason='Docker isn\'t running or can\'t be accessed',`
	`33`	`+ os.name == 'nt' or not docker_is_running(),`
	`34`	`+ reason="Docker isn't running or can't be accessed",`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`skipif_cant_run_swift = pytest.mark.skipif(`