aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2019-05-17 14:28:56 -0400
committerGitHub <noreply@github.com>2019-05-17 14:28:56 -0400
commitae16564097d28c9c1ce8ac19f266dc15429b20b8 (patch)
tree85395f1941957e86dc54db43573fa6c764d1cc0d
parent28c26653e86b01dd707c50b72da5de524aad3fe5 (diff)
downloaddelivery_merge-master.tar.gz
Add badge; Ignore CLI code (#4)HEADmaster
* Add badge; Ignore CLI code * remove debug code
-rw-r--r--.coveragerc2
-rw-r--r--README.md2
-rw-r--r--azure-pipelines.yml4
-rw-r--r--delivery_merge/conda.py1
4 files changed, 4 insertions, 5 deletions
diff --git a/.coveragerc b/.coveragerc
index 5f51efe..3898458 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -13,4 +13,4 @@ omit =
conftest.py
setup.py
tests/*
- delivery_merge/tests/*
+ delivery_merge/cli/*
diff --git a/README.md b/README.md
index 76e9653..609d63f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# delivery_merge
[![Build Status](https://dev.azure.com/astroconda/delivery_merge/_apis/build/status/astroconda.delivery_merge?branchName=master)](https://dev.azure.com/astroconda/delivery_merge/_build/latest?definitionId=1&branchName=master)
-
+[![codecov](https://codecov.io/gh/astroconda/delivery_merge/branch/master/graph/badge.svg)](https://codecov.io/gh/astroconda/delivery_merge)
## What does it do?
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ba3ad70..5e23940 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,8 +25,8 @@ steps:
displayName: 'Install dependencies'
- script: |
- python -m pip install pytest pytest-azurepipelines pytest-cov codecov
- pytest -v --cov=delivery_merge --cov-report=xml tests
+ python -m pip install pytest
+ pytest -v --cov=delivery_merge/ --cov-report=xml --junitxml=junit/results.xml tests/
codecov -t $codecov_token
env:
codecov_token: $(CODECOV_TOKEN)
diff --git a/delivery_merge/conda.py b/delivery_merge/conda.py
index 6dd29b1..0cea822 100644
--- a/delivery_merge/conda.py
+++ b/delivery_merge/conda.py
@@ -24,7 +24,6 @@ def ei_touch():
site_packages = os.path.join(root, *libsp)
pthfile = os.path.join(site_packages, 'easy-install.pth')
- print('PTHFILE = {}'.format(pthfile))
if not os.path.exists(pthfile):
open(pthfile, 'w+').write('')