Skip to content

Commit

Permalink
Merge pull request #52 from acsone/fix-ci-sbi
Browse files Browse the repository at this point in the history
Give some love to CI
  • Loading branch information
sbidoul authored Feb 1, 2023
2 parents 82a3a78 + 352ed56 commit 16a479f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,33 @@ on:
- "[0-9]+.[0-9]+.[0-9]+"

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/[email protected]
tests:
runs-on: ubuntu-latest
runs-on: ${{matrix.machine}}
strategy:
fail-fast: false
matrix:
include:
- python-version: "3.6"
toxenv: "py36-11.0"
machine: ubuntu-20.04
- python-version: "3.6"
toxenv: "py36-12.0"
machine: ubuntu-20.04
- python-version: "3.6"
toxenv: "py36-13.0"
machine: ubuntu-20.04
- python-version: "3.6"
toxenv: "py36-14.0"
machine: ubuntu-20.04
- python-version: "3.8"
toxenv: "py38-15.0"
machine: ubuntu-22.04
- python-version: "3.10"
toxenv: "py310-16.0"
machine: ubuntu-22.04
- python-version: "3.10"
toxenv: "twine_check"
machine: ubuntu-22.04
services:
postgres:
image: postgres:9.6
Expand Down Expand Up @@ -75,7 +76,6 @@ jobs:
deploy:
runs-on: ubuntu-latest
needs:
- pre-commit
- tests
if: startsWith(github.ref, 'refs/tags')
steps:
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 23.1.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
rev: 6.0.0
hooks:
- id: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.32.1
rev: v3.3.1
hooks:
- id: pyupgrade
args: ["--py36-plus"]
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.10.1
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
1 change: 0 additions & 1 deletion click_odoo/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@


class Shell:

shells = ["ipython", "ptpython", "bpython", "python"]

@classmethod
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ passenv =
PGUSER
PGPASSWORD
PGDATABASE
# allow running our install_odoo.py script
allowlist_externals = *

[testenv:twine_check]
description = check that the long description is valid
Expand Down

0 comments on commit 16a479f

Please sign in to comment.