From 39f34769fd7baa4a61ae1d3596a856e4682123a6 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 1 Oct 2020 10:45:56 +0200 Subject: [PATCH 1/3] Split pytest jobs up into one per python version --- .github/workflows/pytest_3_6.yml | 33 +++++++++++++++++++ .github/workflows/pytest_3_7.yml | 33 +++++++++++++++++++ .../{pytest_cov.yml => pytest_3_8_cov.yml} | 33 ++----------------- 3 files changed, 68 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/pytest_3_6.yml create mode 100644 .github/workflows/pytest_3_7.yml rename .github/workflows/{pytest_cov.yml => pytest_3_8_cov.yml} (52%) diff --git a/.github/workflows/pytest_3_6.yml b/.github/workflows/pytest_3_6.yml new file mode 100644 index 00000000..058a1281 --- /dev/null +++ b/.github/workflows/pytest_3_6.yml @@ -0,0 +1,33 @@ +name: python 3.6 + +on: + push: + branches: [ main, dev ] + pull_request: + branches: [ main, dev ] + +jobs: + pyTest36: + runs-on: ubuntu-latest + steps: + - name: Python Setup + uses: actions/setup-python@v1 + with: + python-version: 3.6 + architecture: x64 + - name: Install Packages + run: | + sudo apt update + sudo apt install xvfb libenchant-dev qt5-default + - name: Checkout Source + uses: actions/checkout@v2 + - name: Install Dependencies + run: | + pip install --upgrade pip + pip install -r requirements.txt + pip install PyVirtualDisplay + pip install pytest-timeout + pip install pytest-xvfb + pip install pytest-qt + - name: Run Tests + run: xvfb-run pytest -v --timeout=60 diff --git a/.github/workflows/pytest_3_7.yml b/.github/workflows/pytest_3_7.yml new file mode 100644 index 00000000..4de6d2aa --- /dev/null +++ b/.github/workflows/pytest_3_7.yml @@ -0,0 +1,33 @@ +name: python 3.7 + +on: + push: + branches: [ main, dev ] + pull_request: + branches: [ main, dev ] + +jobs: + pyTest37: + runs-on: ubuntu-latest + steps: + - name: Python Setup + uses: actions/setup-python@v1 + with: + python-version: 3.7 + architecture: x64 + - name: Install Packages + run: | + sudo apt update + sudo apt install xvfb libenchant-dev qt5-default + - name: Checkout Source + uses: actions/checkout@v2 + - name: Install Dependencies + run: | + pip install --upgrade pip + pip install -r requirements.txt + pip install PyVirtualDisplay + pip install pytest-timeout + pip install pytest-xvfb + pip install pytest-qt + - name: Run Tests + run: xvfb-run pytest -v --timeout=60 diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_3_8_cov.yml similarity index 52% rename from .github/workflows/pytest_cov.yml rename to .github/workflows/pytest_3_8_cov.yml index 1969d200..547c6938 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_3_8_cov.yml @@ -1,4 +1,4 @@ -name: pytest +name: python 3.8 on: push: @@ -7,7 +7,7 @@ on: branches: [ main, dev ] jobs: - pyTestCov: + pyTest38Cov: runs-on: ubuntu-latest steps: - name: Python Setup @@ -35,32 +35,3 @@ jobs: run: xvfb-run pytest -v --cov=nw --timeout=60 - name: Upload to Codecov uses: codecov/codecov-action@v1 - - pyTest: - needs: pyTestCov - strategy: - matrix: - python-version: [3.6, 3.7] - runs-on: ubuntu-latest - steps: - - name: Python Setup - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - architecture: x64 - - name: Install Packages - run: | - sudo apt update - sudo apt install xvfb libenchant-dev qt5-default - - name: Checkout Source - uses: actions/checkout@v2 - - name: Install Dependencies - run: | - pip install --upgrade pip - pip install -r requirements.txt - pip install PyVirtualDisplay - pip install pytest-timeout - pip install pytest-xvfb - pip install pytest-qt - - name: Run Tests - run: xvfb-run pytest -v --timeout=60 From 5a913a8b746f625109014575ac0622a04d047733 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 1 Oct 2020 10:53:14 +0200 Subject: [PATCH 2/3] Update readme with badges --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f80342b4..8cf8dba4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # novelWriter -[![pytest](https://github.com/vkbo/novelWriter/workflows/pytest/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![python 3.6](https://github.com/vkbo/novelWriter/workflows/python%203.6/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) +[![python 3.7](https://github.com/vkbo/novelWriter/workflows/python%203.7/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) +[![python 3.8](https://github.com/vkbo/novelWriter/workflows/python%203.8/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/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) +[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) [![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/) From 54f43b911b83f81b3f6ee9c47a395fc96c146bc9 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 1 Oct 2020 11:52:25 +0200 Subject: [PATCH 3/3] Added a line break in badges list --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8cf8dba4..1ace896a 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,11 @@ [![python 3.6](https://github.com/vkbo/novelWriter/workflows/python%203.6/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![python 3.7](https://github.com/vkbo/novelWriter/workflows/python%203.7/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) [![python 3.8](https://github.com/vkbo/novelWriter/workflows/python%203.8/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) -[![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) -[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) +[![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) +[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) [![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/)