Merge pull request #84 from itpp-labs/fork-fix-conflicts

Fork fix conflicts + add v17
itpp-labs · Dec 11, 2023 · afecef1 · afecef1
2 parents 6a8fc51 + f918f27
commit afecef1
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 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/config.yml b/config.yml
@@ -6,6 +6,7 @@ branches:
   - "14.0"
   - "15.0"
   - "16.0"
+  - "17.0"
 
 repos:
   #itpp-labs/misc-addons:

diff --git a/workflow-files/branch2odoo_version.py b/workflow-files/branch2odoo_version.py
@@ -4,6 +4,7 @@
 
 ODOO_VERSIONS = [
     "master",
+    "17.0",
     "16.0",
     "15.0",
     "14.0",

diff --git a/workflow-files/generate-repo-readme.py b/workflow-files/generate-repo-readme.py
@@ -21,16 +21,39 @@
 from github import Github
 from plumbum.cmd import cat
 
-BRANCHES = ["16.0", "15.0", "14.0", "13.0", "12.0", "11.0", "10.0", "9.0", "8.0"]
+BRANCHES = [
+    "17.0",
+    "16.0",
+    "15.0",
+    "14.0",
+    "13.0",
+    "12.0",
+    "11.0",
+    "10.0",
+    "9.0",
+    "8.0",
+]
 REPOS = {
     "pos-addons": {"extra_branches": ["7.0"]},
-    #"mail-addons": {},
-    #"misc-addons": {"extra_branches": ["7.0"]},
+    # "mail-addons": {},
+    # "misc-addons": {"extra_branches": ["7.0"]},
     "sync-addons": {},
     "access-addons": {},
-    #"website-addons": {},
+    # "website-addons": {},
 }
-ODOO_VERSIONS = ["16.0", "15.0", "14.0", "13.0", "12.0", "11.0", "10.0", "9.0", "8.0", "7.0"]
+ODOO_VERSIONS = [
+    "17.0",
+    "16.0",
+    "15.0",
+    "14.0",
+    "13.0",
+    "12.0",
+    "11.0",
+    "10.0",
+    "9.0",
+    "8.0",
+    "7.0",
+]
 
 
 def main(token, repository, branch):

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
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ branches: @@
       - "14.0"
       - "15.0"
       - "16.0"
+      - "17.0"
     repos:
       #itpp-labs/misc-addons:
@@ Expand Down @@