Skip to content

Commit

Permalink
Run CI on all branches and pull requests
Browse files Browse the repository at this point in the history
  • Loading branch information
carlio committed Aug 28, 2021
1 parent 2d19f00 commit 819a4a5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 68 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: CI

on:
push:
branches:
- master
pull_request: ~
on: [push, pull_request]

env:
CACHE_VERSION: 3
Expand Down Expand Up @@ -49,7 +45,7 @@ jobs:
run: |
python -m venv venv
. venv/bin/activate
python -m pip install -U poetry
python -m pip install --disable-pip-version-check -U pip poetry
poetry install -E with_everything
- name: Generate pre-commit restore key
id: generate-pre-commit-key
Expand Down Expand Up @@ -110,6 +106,7 @@ jobs:
- name: Run formatting check
run: |
. venv/bin/activate
python -m pip install --disable-pip-version-check -U pip poetry
poetry install -E with_everything
pre-commit run --all-files
Expand All @@ -118,7 +115,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev]
python-version: [3.6, 3.7, 3.8, 3.9]
outputs:
python-key: ${{ steps.generate-python-key.outputs.key }}
steps:
Expand Down Expand Up @@ -152,7 +149,7 @@ jobs:
run: |
python -m venv venv
. venv/bin/activate
python -m pip install -U poetry
python -m pip install --disable-pip-version-check -U pip poetry
poetry install -E with_everything
pytest-linux:
Expand All @@ -162,7 +159,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev]
python-version: [3.6, 3.7, 3.8, 3.9]
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2.3.4
Expand All @@ -187,7 +184,7 @@ jobs:
- name: Run pytest
run: |
. venv/bin/activate
python -m pip install -U poetry
python -m pip install --disable-pip-version-check -U pip poetry
poetry install
pytest --benchmark-disable --cov --cov-report= tests/
Expand Down Expand Up @@ -224,8 +221,8 @@ jobs:
- name: Run nosetests
run: |
. venv/bin/activate
pip install -U poetry
pip freeze | safety check --stdin
python -m pip install --disable-pip-version-check -U pip poetry
poetry install
nosetests -s --with-coverage --cover-inclusive --cover-package=prospector tests/
mv .coverage .coverage.x
coverage run --parallel-mode prospector/run.py || true
Expand Down
56 changes: 1 addition & 55 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ tzlocal = "^3.0"
nose = "^1.3.7"
coverage = "^5.5"
pre-commit = "^2.14.0"
safety = "^1.10.3"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down

0 comments on commit 819a4a5

Please sign in to comment.