diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eec6551..fa0d8a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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/action@v2.0.0 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 @@ -75,7 +76,6 @@ jobs: deploy: runs-on: ubuntu-latest needs: - - pre-commit - tests if: startsWith(github.ref, 'refs/tags') steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 12fe222..f46d76b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 diff --git a/click_odoo/console.py b/click_odoo/console.py index 73785fd..3ed8429 100644 --- a/click_odoo/console.py +++ b/click_odoo/console.py @@ -9,7 +9,6 @@ class Shell: - shells = ["ipython", "ptpython", "bpython", "python"] @classmethod diff --git a/tox.ini b/tox.ini index 8eae1bd..2069c8c 100644 --- a/tox.ini +++ b/tox.ini @@ -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