add badge fix help

Author: gaborbernat

README.md

@@ -1,5 +1,7 @@
 # tox azure-pipeline-template
 
+[![Build Status](https://dev.azure.com/toxdev/azure-pipelines-template/_apis/build/status/tox-dev.azure-pipelines-template?branchName=master)](https://dev.azure.com/toxdev/azure-pipelines-template/_build/latest?definitionId=11&branchName=master)
+
 This a template that will help simplify the [Azure Pipelines](https://azure.microsoft.com/en-gb/services/devops/pipelines/)
 configuration when using [tox](https://tox.readthedocs.org) to drive your CI.
 
@@ -34,41 +36,35 @@ This job template will run tox for a given set of tox targets on given platform
 Features and functionality:
 
 - each specified toxenv target maps to a single Azure Pipelines job
-- provision a python for the job
-- install tox into that python
+- make tox available in the job: provision a python (``3.7``) and install a specified tox into that
+- provision a python needed for the target tox environment
 - provision the target tox environment (create environment, install dependencies)
 - invoke the tox target
 - if a junit file is found under `.tox\junit.{toxenv}.xml` upload it as test report
-- if a coverage file is found under `.tox\coverage.xml` or `.tox\.coverage` upload it as build artifact
+- if coverage is requested, run a tox target that should generate the `.tox\coverage.xml` or `.tox\.coverage`
+ and upload those as a build artifact
+- if coverage was requested queue a job that post all toxenv runs will merge all the coverages via a tox target
 
 ### example
 
 The following example will run `py36` and `py37` on Windows, Linux and MacOs. It will also invoke
-`fix_lint` and `docs` target with `python3.7` on Linux. Note how the root level name can be used
-to automatically specify the target platform (defaults to Linux).
+`fix_lint` and `docs` target with `python3.7` on Linux.
 
 ```yaml
 jobs:
 - template: run-tox-env.yml@tox
   parameters:
+    tox_version: ''
     jobs:
-      windows:
-        toxenvs:
-        - py37
-        - py36
-      linux:
-        toxenvs:
-        - py37
-        - py36
-      macOs:
-        toxenvs:
-        - py37
-        - py27
-      check:
-        py: '3.7'
-        toxenvs:
-        - fix_lint
-        - docs
+      fix_lint: null
+      docs: null
+      py37:
+        image: [linux, windows, macOs]
+      py36:
+        image: [linux, windows, macOs]
+    coverage:
+      with_toxenv: 'coverage' # generate .tox/.coverage, .tox/coverage.xml after test run
+      for_envs: [py37, py36, py35, py34, py27]
 ```
 
 

merge-coverage.yml

@@ -40,8 +40,12 @@ jobs:
           shutil.copy(str(coverage_file), str(destination))'
     displayName: move coverage files into .tox
 
-  - script: ${{ format('python -m pip install -U --user --force-reinstall {0}', parameters.tox_version) }}
-    displayName: install tox
+  - ${{ if parameters.tox_version }}:
+    - script: ${{ format('python -m pip install -U --user --force-reinstall {0}', parameters.tox_version) }}
+      displayName: ${{ format('install {0} from PyPi', parameters.tox_version) }}
+  - ${{ if not(parameters.tox_version) }}:
+    - script: python -m pip install -U --user --force-reinstall .
+      displayName: install tox inline
 
   - script: 'python -m tox -e py -vv --sdistonly'
     displayName: run package build to ensure generated files present

publish-pypi.yml

@@ -20,7 +20,7 @@ jobs:
       externalFeeds: ${{ parameters.external_feed}}
   - script: 'python -m pip install -U --user --force-reinstall twine pep517'
     displayName: "acquire build tools"
-  - script: 'python -m pep517.build -m --binary --source --out-dir "$(System.DefaultWorkingDirectory)/w" .'
+  - script: 'python -m pep517.build --binary --source --out-dir "$(System.DefaultWorkingDirectory)/w" .'
     displayName: "build wheel and source distribution"
   - script:  ${{ format('python3.7 -m twine upload -r {0} --config-file $(PYPIRC_PATH) "$(System.DefaultWorkingDirectory)/w/*"', parameters.pypi_remote) }}
     displayName: "upload sdist and wheel to PyPi"

run-tox-env.yml

@@ -4,26 +4,33 @@ parameters:
   coverage:
     with_toxenv: ''
     for_envs: []
+  dependsOn: []
 
 jobs:
 - ${{ each job in parameters.jobs }}:
   - job: ${{ coalesce(job.value.name, job.key) }}
+    dependsOn: ${{ coalesce(job.value.dependsOn, parameters.dependsOn) }}
     strategy:
       matrix:
         ${{ if job.value.image }}:
           ${{ each image in job.value.image }}:
             ${{ image }}:
               ${{ if eq(image, 'linux') }}:
                 image: 'Ubuntu-16.04'
+                image_name: 'linux'
               ${{ if eq(image, 'windows') }}:
                 image: 'windows-2019'
+                image_name: 'windows'
               ${{ if eq(image, 'macOs') }}:
                 image: 'macOS-10.14'
+                image_name: 'macOs'
               ${{ if notIn(image, 'macOs', 'linux', 'windows') }}:
                 image: ${{ coalesce(image, 'Ubuntu-16.04') }}
+                image_name: ${{ coalesce(image, 'linux') }}
         ${{ if not(job.value.image) }}:
           linux:
             image: 'Ubuntu-16.04'
+            image_name: 'linux'
     pool:
       vmImage: $[ variables['image'] ]
 
@@ -99,7 +106,11 @@ jobs:
     - script: 'python -c "import sys; print(sys.version); print(sys.executable);"'
       displayName: show python information
 
-    # allow user to plugin further improvements
+    # allow user to run global before
+    - ${{ if parameters.before }}:
+      - ${{ parameters.before }}
+
+    # allow user to run per job setup
     - ${{ if job.value.before }}:
       - ${{ job.value.before }}
 
@@ -141,7 +152,7 @@ jobs:
           ArtifactName: 'coverage-$(Agent.OS)-$(Agent.OSArchitecture)-$(TOXENV)'
 
 - ${{ if and(parameters.coverage.with_toxenv, parameters.coverage.for_envs) }}:
-  - template: merge-coverage.yml@tox
+  - template: merge-coverage.yml
     parameters:
       tox_version: ${{ parameters.tox_version }}
       toxenv: ${{ parameters.coverage.with_toxenv }}