Skip to content

Commit

Permalink
Merge branch 'main' into 159-feat-bms-return-variable-number-of-models
Browse files Browse the repository at this point in the history
  • Loading branch information
hollandjg authored Dec 8, 2022
2 parents aed52ab + 67f37bb commit b3ad2d3
Show file tree
Hide file tree
Showing 6 changed files with 501 additions and 295 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/pre-commit-hooks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Run pre-commit-hooks

on:
pull_request:
branches: [ "main" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- run: pipx install poetry
- uses: actions/setup-python@v4
with:
python-version: 3.8
cache: "poetry"
- run: poetry install --only pre-commit
- uses: actions/cache@v3
with:
path: ~/.cache/pre-commit
key: pre-commit-3|${{ env.pythonLocation }}|${{ runner.os }}|${{ hashFiles('.pre-commit-config.yaml') }}
- run: poetry run pre-commit run --all-files --show-diff-on-failure --color=always
28 changes: 28 additions & 0 deletions .github/workflows/py.test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Run tests

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
test:
strategy:
fail-fast: true
matrix:
python-version: ["3.8", "3.9", "3.10"]
os: [ubuntu-latest] # macos-latest, windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- run: pipx install poetry
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- run: poetry install --with test
- run: poetry run pytest
47 changes: 0 additions & 47 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repos:
- "--filter-files"
- "--project=autora"
- repo: https://github.com/pycqa/flake8
rev: 5.0.4
rev: 6.0.0
hooks:
- id: flake8
args:
Expand Down
Loading

0 comments on commit b3ad2d3

Please sign in to comment.