Corrected coverage execution

asqui · Apr 11, 2018 · 7c313dc · 7c313dc
1 parent b2c55cf
commit 7c313dc
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 69 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,72 +1,87 @@
 language: python
+cache:
+- pip
 sudo: false
-matrix:
-  fast_finish: false
 os:
 - linux
-python:
-- '2.7'
-- '3.4'
-- '3.5'
-- '3.6'
-install:
-- pip -q --log dist/pip.log install --upgrade pip setuptools tox-travis py wheel
-- touch ChangeLog
-- python setup.py sdist bdist_wheel install
-- pip install ./dist/*.whl
-- pip --version
+stages:
+- docs
+- test
+- deploy
 script:
-- export PACKAGE_NAME=$(python setup.py --name)
-- export PACKAGE_VERSION=$(python setup.py --version)
-- python setup.py --version
-- tox --installpkg ./dist/*.whl --travis-after
-# validates that the build source distribution is installable using the old easy_install
-- pip uninstall -y $PACKAGE_NAME && easy_install ./dist/$PACKAGE_NAME-*.tar.gz
-after_success:
-- coveralls
-- bash <(curl -s https://codecov.io/bash)
-- requires.io update-site -t ac3bbcca32ae03237a6aae2b02eb9411045489bb -r
 notifications:
   email:
   - [email protected]
-  - [email protected]
-deploy:
-- provider: releases
-  api_key:
-    secure: G19YtkGAX0aJ1oyd/7eRj1KYdsmAkjkfU2UISvsjh/68ec1+9qtPpN7BbkFYZYMjSx0BtS0SEEA7Vdl4F9DI9Zzqahbj7WzDLFe9/4aZKM/ztfKWR6CNAYaMazAKS5W7r9pPkBBDIIJ9zCqvV7FRzjewEpfTwFzwUdY+IpxEsAM=
-  file:
-  - dist/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz
-  - dist/$PACKAGE_NAME-$PACKAGE_VERSION-py2.py3-none-any.whl
-  - ChangeLog
-  skip_cleanup: true
-  on:
-    repo: pycontribs/jira
-    tags: true
-    python: 2.7
-    condition: $TOXENV != docs
-- provider: pypi
-  user: pycontribs
-  password:
-    secure: "CmBFcxAT3IAWpnqe9eFmfHfbPBvayGMNLC+P+9KKUGaf+k7vnIYB11vNNCYUrm/jVOR12szWAcGoUQMkUQrWcrShEidsYENOdreJnasZp0I+2uMbMFw1v2Mn7Kyiilv1q/m1G05cH3ls863SBIxOARoN/Ce24vhVgg3BO+GpoP8="
-  distributions: sdist bdist_wheel
-  skip_cleanup: true
-  on:
-    tags: true
+  - [email protected]  
+jobs:
+  include:
+  - stage: docs
+    script: python -m tox
     python: 2.7
-    condition: $TOXENV != docs
-    branch: master
-- provider: pypi
-  server: https://test.pypi.org/legacy/
-  user: ssbarnea
-  password:
-    secure: "FR8vDM2tWsT1ApQFfbbDO4B6tKZcRGzdRO2or2p8fY5uDEKbIa/SSJaIeaRluHbcxB6cedI1gJ5oCl2+kF0Km9LZqpT+mU4/StiWBBTHj/WmbBTXEROC28JuY6PzGJ+MYySFfLErRWqZZX6XxBzbNebDfdj6Gt8cQZXpvWr/1JA="
-  distributions: sdist bdist_wheel
-  skip_cleanup: true
-  on:
-    tags: false
+    env: TOXENV=docs
+  - stage: test
+    script: python -m tox
     python: 2.7
-    condition: $TOXENV != docs
-    branch: develop
+    env: TOXENV=py27
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
+    - requires.io update-site -t ac3bbcca32ae03237a6aae2b02eb9411045489bb -r
+  - stage: test
+    script: python -m tox
+    python: 3.4
+    env: TOXENV=py34
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
+  - stage: test
+    script: python -m tox
+    python: 3.5
+    env: TOXENV=py35
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
+  - stage: test
+    script: python -m tox
+    python: 3.6
+    env: TOXENV=py36 PYTHON='3.6' PYENV_VERSION='system'
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -e TOX_ENV
+  - stage: deploy
+    script:
+    - export PACKAGE_NAME=$(python setup.py --name)
+    - export PACKAGE_VERSION=$(python setup.py --version)
+    - python setup.py sdist bdist_wheel
+deploy:
+  - provider: pypi
+    user: pycontribs
+    password:
+      secure: "CmBFcxAT3IAWpnqe9eFmfHfbPBvayGMNLC+P+9KKUGaf+k7vnIYB11vNNCYUrm/jVOR12szWAcGoUQMkUQrWcrShEidsYENOdreJnasZp0I+2uMbMFw1v2Mn7Kyiilv1q/m1G05cH3ls863SBIxOARoN/Ce24vhVgg3BO+GpoP8="
+    distributions: sdist bdist_wheel
+    skip_cleanup: true
+    on:
+      tags: true
+      branch: master
+      repo: pycontribs/jira
+  - provider: pypi
+    server: https://test.pypi.org/legacy/
+    user: ssbarnea
+    password:
+      secure: "FR8vDM2tWsT1ApQFfbbDO4B6tKZcRGzdRO2or2p8fY5uDEKbIa/SSJaIeaRluHbcxB6cedI1gJ5oCl2+kF0Km9LZqpT+mU4/StiWBBTHj/WmbBTXEROC28JuY6PzGJ+MYySFfLErRWqZZX6XxBzbNebDfdj6Gt8cQZXpvWr/1JA="
+    distributions: sdist bdist_wheel
+    skip_cleanup: true
+    on:
+      tags: false
+      branch: develop
+      repo: pycontribs/jira
+  - provider: releases
+    api_key:
+      secure: G19YtkGAX0aJ1oyd/7eRj1KYdsmAkjkfU2UISvsjh/68ec1+9qtPpN7BbkFYZYMjSx0BtS0SEEA7Vdl4F9DI9Zzqahbj7WzDLFe9/4aZKM/ztfKWR6CNAYaMazAKS5W7r9pPkBBDIIJ9zCqvV7FRzjewEpfTwFzwUdY+IpxEsAM=
+    file:
+    - dist/$PACKAGE_NAME-$PACKAGE_VERSION.tar.gz
+    - dist/$PACKAGE_NAME-$PACKAGE_VERSION-py2.py3-none-any.whl
+    - ChangeLog
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: pycontribs/jira
 env:
   global:
   - secure: fuXwQL+KHQ96XkAFl2uQc8eK8dAjrgkup46tck/UGjVpdv1PT/yHmBKrvpFjDa50ueGbtBwTdKAwhyAmYuiZCk2IYHzdvBylCZBBji2FSpaTM59CVwgkVT6tx3HHO83X0mEX6ih9TJvZD5XhX+YUjopnseRXRq3ey3JZJXWN4RM=

diff --git a/codecov.yml b/codecov.yml
@@ -0,0 +1,3 @@
+comment:
+  layout: diff
+  comment: false
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.3.1
-envlist = {py27,py34,py35,py36}-{win,linux,darwin},docs
+envlist = py27,py34,py35,py36,docs
 skip_missing_interpreters = true
 
 [testenv:docs]
@@ -21,22 +21,17 @@ extras =
     cli
     opt
 sitepackages=False
-platform =
-       win: windows
-       linux: linux
-       darwin: darwin
 commands=
     python -m pip check
     python -m flake8
     python -m pytest
 passenv =
+    CI
     CI_JIRA_*
-    TRAVIS*
+    TRAVIS
+    TRAVIS_*
     XDG_CACHE_HOME
 envars =
     PIP_DISABLE_PIP_VERSON_CHECK=1
 whitelist_externals =
     bash
-
-[travis:after]
-toxenv = py27