From 61637346b01b0ae744380dd2d655d949246598fa Mon Sep 17 00:00:00 2001 From: Bruce Fenske Date: Wed, 17 Apr 2019 22:43:36 -0600 Subject: [PATCH 1/6] Added pytest, code coverage, and additional python versions to travis.yml --- .gitignore | 5 +++++ .travis.yml | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad49713..2bfa87c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ _build __pycache__ venv3 .idea +.vscode/settings.json +.pytest_cache/ +.coverage +Pipfile +Pipfile.lock diff --git a/.travis.yml b/.travis.yml index aba295e..fad77fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,23 @@ language: python python: - "2.7" - "3.2" + - "3.3" + - "3.4" + - "3.5" + - "3.6" + - "3.7" + # command to install dependencies install: - - "pip install . --use-mirrors" + - "pip install . --use-mirrors" + - pip install -qq pytest + - pip install -qq "pytest-cov<2.6" + - pip install -qq python-coveralls + - pip install --upgrade pip # command to run tests -script: python -m unittest discover +script: + - py.test --cov=py_linq + +after_success: + - coveralls \ No newline at end of file From becfbd37ab34d6db55f6730673ea30e0bd353e00 Mon Sep 17 00:00:00 2001 From: Bruce Fenske Date: Wed, 17 Apr 2019 23:23:50 -0600 Subject: [PATCH 2/6] Added badges to README for Travis CI and Coveralls --- README.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.rst b/README.rst index 027b129..2bdcac2 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,9 @@ ++-----------------------+--------------------------------------------------------------------------------------+ +|Travis CI Dev | .. image:: https://travis-ci.org/viralogic/Meta.svg?branch=develop | ++-----------------------+--------------------------------------------------------------------------------------+ +|Coveralls Dev | .. image:: https://coveralls.io/repos/github/viralogic/Meta/badge.svg?branch=develop | ++-----------------------+--------------------------------------------------------------------------------------+ + Meta ==== From 251d01120f21a937f80e165c58646fae4ab043b0 Mon Sep 17 00:00:00 2001 From: Bruce Fenske Date: Wed, 17 Apr 2019 23:30:20 -0600 Subject: [PATCH 3/6] Travis CI Python 3.7 --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fad77fc..7704f05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,13 @@ python: - "3.4" - "3.5" - "3.6" - - "3.7" + + # Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs +matrix: + include: + - python: 3.7 + dist: xenial + sudo: true # command to install dependencies install: From c94ccd2f78a7a060f6ce7d21c8043b4579bd2f62 Mon Sep 17 00:00:00 2001 From: Bruce Fenske Date: Wed, 17 Apr 2019 23:38:32 -0600 Subject: [PATCH 4/6] README badges --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 2bdcac2..294dab6 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,8 @@ -+-----------------------+--------------------------------------------------------------------------------------+ -|Travis CI Dev | .. image:: https://travis-ci.org/viralogic/Meta.svg?branch=develop | -+-----------------------+--------------------------------------------------------------------------------------+ -|Coveralls Dev | .. image:: https://coveralls.io/repos/github/viralogic/Meta/badge.svg?branch=develop | -+-----------------------+--------------------------------------------------------------------------------------+ ++-----------------------+------------------------------------------------------------------------------------------------------------------------------------------------+ +|Travis CI Dev | .. image:: https://travis-ci.org/viralogic/Meta.svg?branch=develop:target: https://travis-ci.org/viralogic/Meta | ++-----------------------+------------------------------------------------------------------------------------------------------------------------------------------------+ +|Coveralls Dev | .. image:: https://coveralls.io/repos/github/viralogic/Meta/badge.svg?branch=developtarget: https://coveralls.io/github/viralogic/Meta | ++-----------------------+------------------------------------------------------------------------------------------------------------------------------------------------+ Meta ==== From 5df2e3e68c4f51bd76bf9d470abe236ed11f67fb Mon Sep 17 00:00:00 2001 From: Bruce Fenske Date: Wed, 17 Apr 2019 23:40:31 -0600 Subject: [PATCH 5/6] removed pip install --use-mirrors as this was causing Travis CI builds to fail --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7704f05..3fae0f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ matrix: # command to install dependencies install: - - "pip install . --use-mirrors" - pip install -qq pytest - pip install -qq "pytest-cov<2.6" - pip install -qq python-coveralls From 338c3505126bcf2b6a5654058e02ea682c9018c7 Mon Sep 17 00:00:00 2001 From: Bruce Fenske Date: Wed, 17 Apr 2019 23:44:35 -0600 Subject: [PATCH 6/6] referencing wrong directory in pytest coverage --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3fae0f3..560cad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: # command to run tests script: - - py.test --cov=py_linq + - py.test --cov=meta after_success: - coveralls \ No newline at end of file