Merge branch 'main' into minimal_setup

This commit is contained in:
Veronica K. B. Olsen
2021-05-02 15:41:08 +02:00
7 changed files with 14 additions and 124 deletions
@@ -1,4 +1,4 @@
name: Linux (3.6)
name: Linux
on:
push:
@@ -7,13 +7,16 @@ on:
branches: [ main, testing, dev ]
jobs:
testLinux36:
testLinux:
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
runs-on: ubuntu-latest
steps:
- name: Python Setup
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: ${{ matrix.python-version }}
architecture: x64
- name: Install Packages
run: |
-37
View File
@@ -1,37 +0,0 @@
name: Linux (3.7)
on:
push:
branches: [ main, testing, dev ]
pull_request:
branches: [ main, testing, dev ]
jobs:
testLinux37:
runs-on: ubuntu-latest
steps:
- name: Python Setup
uses: actions/setup-python@v2
with:
python-version: 3.7
architecture: x64
- name: Install Packages
run: |
sudo apt update
sudo apt install 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 pytest-timeout
pip install pytest-cov
pip install pytest-qt
pip install codecov
- name: Run Tests
run: |
export QT_QPA_PLATFORM=offscreen
pytest -v --cov=nw --timeout=60
- name: Upload to Codecov
uses: codecov/codecov-action@v1
-37
View File
@@ -1,37 +0,0 @@
name: Linux (3.8)
on:
push:
branches: [ main, testing, dev ]
pull_request:
branches: [ main, testing, dev ]
jobs:
testLinux38:
runs-on: ubuntu-latest
steps:
- name: Python Setup
uses: actions/setup-python@v2
with:
python-version: 3.8
architecture: x64
- name: Install Packages
run: |
sudo apt update
sudo apt install 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 pytest-timeout
pip install pytest-cov
pip install pytest-qt
pip install codecov
- name: Run Tests
run: |
export QT_QPA_PLATFORM=offscreen
pytest -v --cov=nw --timeout=60
- name: Upload to Codecov
uses: codecov/codecov-action@v1
-37
View File
@@ -1,37 +0,0 @@
name: Linux (3.9)
on:
push:
branches: [ main, testing, dev ]
pull_request:
branches: [ main, testing, dev ]
jobs:
testLinux39:
runs-on: ubuntu-latest
steps:
- name: Python Setup
uses: actions/setup-python@v2
with:
python-version: 3.9
architecture: x64
- name: Install Packages
run: |
sudo apt update
sudo apt install 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 pytest-timeout
pip install pytest-cov
pip install pytest-qt
pip install codecov
- name: Run Tests
run: |
export QT_QPA_PLATFORM=offscreen
pytest -v --cov=nw --timeout=60
- name: Upload to Codecov
uses: codecov/codecov-action@v1
+2 -2
View File
@@ -1,4 +1,4 @@
name: macOS (3.9)
name: macOS
on:
push:
@@ -7,7 +7,7 @@ on:
branches: [ main, testing, dev ]
jobs:
testMac39:
testMac:
runs-on: macos-latest
steps:
- name: Python Setup
+2 -2
View File
@@ -1,4 +1,4 @@
name: Windows (3.9)
name: Windows
on:
push:
@@ -7,7 +7,7 @@ on:
branches: [ main, testing, dev ]
jobs:
testWin39:
testWin:
runs-on: windows-latest
steps:
- name: Python Setup
+4 -6
View File
@@ -1,14 +1,12 @@
# novelWriter
[![Linux (3.6)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.6)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Linux (3.7)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.7)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Linux (3.8)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Linux (3.9)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Windows (3.9)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![macOS (3.9)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
[![Linux](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml)
[![Windows](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml)
[![macOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml)
[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/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)
[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest)
[![release](https://img.shields.io/github/v/release/vkbo/novelwriter)](https://github.com/vkbo/novelWriter/releases)
[![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)