From 4bff1453947bcc9b688eaa4c4f6087aad5058874 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:30:56 +0200 Subject: [PATCH 1/7] Fixed badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7adc676f..3bbe3976 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # novelWriter -[![PyTest + Coverage](https://github.com/vkbo/novelWriter/workflows/PyTest%20+%20Coverage/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) +[![PyTest](https://github.com/vkbo/novelWriter/workflows/PyTest/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![Documentation Status](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) [![Flake8 Checks](https://github.com/vkbo/novelWriter/workflows/Flake8%20Checks/badge.svg)](https://github.com/vkbo/novelWriter/actions) From bf14e626e0b7bc0159bc3c2972c05d61c1b427cb Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:31:33 +0200 Subject: [PATCH 2/7] Also include push to main --- .github/workflows/pytest_cov.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_cov.yml index 8e60f72b..ceffa275 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_cov.yml @@ -1,6 +1,8 @@ name: PyTest on: + push: + branches: [ main ] pull_request: branches: [ main, dev ] From 326dfb44f157f711c33b42858b2d0df67c5fd787 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:33:25 +0200 Subject: [PATCH 3/7] Renamed Flake8 Checks to Flake8 --- .github/workflows/syntax.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 20736e91..980bef02 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -1,4 +1,4 @@ -name: Flake8 Checks +name: Flake8 on: push: From 8210a78b1fb21ea0796c2402e77867f18488c61f Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:35:06 +0200 Subject: [PATCH 4/7] Updated badges again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3bbe3976..92c134ac 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![PyTest](https://github.com/vkbo/novelWriter/workflows/PyTest/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![Documentation Status](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) -[![Flake8 Checks](https://github.com/vkbo/novelWriter/workflows/Flake8%20Checks/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![Flake8](https://github.com/vkbo/novelWriter/workflows/Flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![PyPI](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter/) [![Python Version](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter/) From 0ded954efdd49c524ad46c870597721c30694856 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:42:48 +0200 Subject: [PATCH 5/7] Don't runn full tests on push to master --- .github/workflows/pytest_cov.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_cov.yml index ceffa275..8e60f72b 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_cov.yml @@ -1,8 +1,6 @@ name: PyTest on: - push: - branches: [ main ] pull_request: branches: [ main, dev ] From f5c750520cb0a8f071ea5806bc0cbecc0474bd9c Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:46:01 +0200 Subject: [PATCH 6/7] Use lower case test names --- .github/workflows/pytest_cov.yml | 2 +- .github/workflows/syntax.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_cov.yml index 8e60f72b..e46773a4 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_cov.yml @@ -1,4 +1,4 @@ -name: PyTest +name: pytest on: pull_request: diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 980bef02..f697c4ec 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -1,4 +1,4 @@ -name: Flake8 +name: flake8 on: push: From cde43a25ff30eee6b574af6c005f14c01bb2e416 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:50:33 +0200 Subject: [PATCH 7/7] Updated badges on readme and in docs --- README.md | 10 +++++----- docs/source/index.rst | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 92c134ac..78849745 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # novelWriter -[![PyTest](https://github.com/vkbo/novelWriter/workflows/PyTest/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![pytest](https://github.com/vkbo/novelWriter/workflows/pytest/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) -[![Documentation Status](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) -[![Flake8](https://github.com/vkbo/novelWriter/workflows/Flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) -[![PyPI](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter/) -[![Python Version](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter/) +[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) +[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter/) +[![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter/) diff --git a/docs/source/index.rst b/docs/source/index.rst index 152c6666..8ac56990 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -2,11 +2,11 @@ novelWriter |release| ##################### -.. image:: https://travis-ci.com/vkbo/novelWriter.svg?branch=master - :target: https://travis-ci.com/vkbo/novelWriter - :alt: Build Status +.. image:: https://github.com/vkbo/novelWriter/workflows/pytest/badge.svg + :target: https://github.com/vkbo/novelWriter/actions + :alt: Python Tests -.. image:: https://codecov.io/gh/vkbo/novelWriter/branch/master/graph/badge.svg +.. image:: https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg :target: https://codecov.io/gh/vkbo/novelWriter :alt: Code Coverage