Change the branching model (#827)

* Update workflows and add requirements-dev.txt
* Remove codecov from dev requirements
* Update readme and contributing guide
* Update PR template
This commit is contained in:
Veronica Berglyd Olsen
2021-07-13 15:34:10 +02:00
committed by GitHub
parent 6890b278ea
commit fb5347b8e4
8 changed files with 45 additions and 59 deletions
+3 -2
View File
@@ -2,18 +2,19 @@
Please check the following before you make a pull request:
* The branch you are making the pull request from (in your own fork) has a unique and descriptive
name. Do not make a pull request directly from your copy of `main`, `dev` or `testing`.
name. Do not make a pull request directly from your copy of `main`.
* If you are submitting translation files, only submit the files that you have added translations
to, not the other .ts files that may have been updated in the process.
* Make sure your contribution follows the style guide and other requirements mentioned in the
CONTRIBUTING.md file in the repository.
* Fill in the Summary section below, and if relevant, mention the issue numbers related to the PR.
-->
**Summary:**
**Related Issue(s):**
**Checklist:**
**Reviewer's Checklist:**
* [ ] The header of all files contain a reference to the repository license
* [ ] The overall test coverage is increased or remains the same as before
+4 -2
View File
@@ -2,9 +2,11 @@ name: flake8
on:
push:
branches: [ main, testing, dev ]
branches:
- main
pull_request:
branches: [ main, testing, dev ]
branches:
- main
jobs:
checkSyntax:
+6 -7
View File
@@ -2,9 +2,11 @@ name: Linux
on:
push:
branches: [ main, testing, dev ]
branches:
- main
pull_request:
branches: [ main, testing, dev ]
branches:
- main
jobs:
testLinux:
@@ -21,17 +23,14 @@ jobs:
- name: Install Packages (apt)
run: |
sudo apt update
sudo apt install libenchant-dev qt5-default qttools5-dev-tools
sudo apt install libenchant-dev qttools5-dev-tools
- name: Checkout Source
uses: actions/checkout@v2
- name: Install Dependencies (pip)
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
pip install -r requirements-dev.txt
- name: Run Build Commands
run: python setup.py qtlrelease sample
- name: Run Tests
+5 -6
View File
@@ -2,9 +2,11 @@ name: macOS
on:
push:
branches: [ main, testing, dev ]
branches:
- main
pull_request:
branches: [ main, testing, dev ]
branches:
- main
jobs:
testMac:
@@ -24,11 +26,8 @@ jobs:
run: |
pip install --upgrade pip
pip install -r requirements.txt
pip install -r requirements-dev.txt
pip install pyobjc
pip install pytest-timeout
pip install pytest-cov
pip install pytest-qt
pip install codecov
- name: Run Tests
run: |
export QT_QPA_PLATFORM=offscreen
+5 -6
View File
@@ -2,9 +2,11 @@ name: Windows
on:
push:
branches: [ main, testing, dev ]
branches:
- main
pull_request:
branches: [ main, testing, dev ]
branches:
- main
jobs:
testWin:
@@ -21,10 +23,7 @@ jobs:
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
pip install -r requirements-dev.txt
- name: Run Tests
run: |
pytest -v --cov=nw --timeout=60