Merge remote-tracking branch 'origin/master' into fork-fix-conflicts

itpp-labs · Dec 11, 2023 · cc65af0 · cc65af0
2 parents 6a8fc51 + 0ad4989
commit cc65af0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-python@v1
         with:
-          python-version: "3.7.x"
+          python-version: "3.8.x"
       - name: Check Python Version
         run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -46,7 +46,7 @@ repos:
     hooks:
       - id: pyupgrade
   - repo: https://github.com/PyCQA/isort
-    rev: 5.5.1
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort except __init__.py

diff --git a/workflow-files/odoo-module-migrator-mix.yml b/workflow-files/odoo-module-migrator-mix.yml
@@ -5,5 +5,5 @@
   merges:
     - oca master
     #- oca refs/pull/12345/head # example
-    - itpp-labs change-odoo-version-only-2
+    - itpp-labs change-odoo-version-only-2024
   target: oca master