From 13f1c3149a6766239e04211999423d72becd0bba Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Thu, 15 May 2025 10:09:13 +0200 Subject: [PATCH] fix: this is Odoo 18.0 branch --- .copier-answers.yml | 2 +- .github/workflows/pre-commit.yml | 6 +++--- .github/workflows/test.yml | 14 +++++++------- .gitignore | 9 ++++++--- .pre-commit-config.yaml | 2 +- .pylintrc | 2 +- .pylintrc-mandatory | 2 +- README.md | 6 +++--- base_fileurl_field/__manifest__.py | 2 +- cloud_platform/__manifest__.py | 2 +- monitoring_log_requests/__manifest__.py | 2 +- monitoring_statsd/__manifest__.py | 2 +- test_base_fileurl_field/__manifest__.py | 2 +- 13 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 3116009..79e397d 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -13,7 +13,7 @@ github_enable_stale_action: true github_enforce_dev_status_compatibility: false include_wkhtmltopdf: false odoo_test_flavor: Both -odoo_version: 17.0 +odoo_version: 18.0 org_name: Camptocamp org_slug: camptocamp rebel_module_groups: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 7c4a715..128a6bc 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,11 +3,11 @@ name: pre-commit on: pull_request: branches: - - "17.0*" + - "18.0*" push: branches: - - "17.0" - - "17.0-ocabot-*" + - "18.0" + - "18.0-ocabot-*" jobs: pre-commit: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0c78a3..17f7f3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,11 +3,11 @@ name: tests on: pull_request: branches: - - "17.0*" + - "18.0*" push: branches: - - "17.0" - - "17.0-ocabot-*" + - "18.0" + - "18.0-ocabot-*" jobs: unreleased-deps: @@ -35,17 +35,17 @@ jobs: fail-fast: false matrix: include: - - container: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest + - container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest include: "attachment_azure,cloud_platform_azure" name: test with Odoo - - container: ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest + - container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest include: "attachment_azure,cloud_platform_azure" name: test with OCB makepot: "false" - - container: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest + - container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest exclude: "attachment_azure,cloud_platform_azure" name: test with Odoo - - container: ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest + - container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest exclude: "attachment_azure,cloud_platform_azure" name: test with OCB makepot: "false" diff --git a/.gitignore b/.gitignore index 0090721..cdcd167 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,6 @@ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] -/.venv -/.pytest_cache -/.ruff_cache # C extensions *.so @@ -30,6 +27,9 @@ pip-log.txt pip-delete-this-directory.txt # Unit test / coverage reports +/.pytest_cache +/.ruff_cache +/.venv htmlcov/ .tox/ .coverage @@ -64,6 +64,9 @@ coverage.xml # Rope .ropeproject +# Pyenv +.python-version + # Sphinx documentation docs/_build/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df9807c..9d54873 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -56,7 +56,7 @@ repos: - id: oca-gen-addon-readme args: - --addons-dir=. - - --branch=17.0 + - --branch=18.0 - --org-name=camptocamp - --repo-name=odoo-cloud-platform - --if-source-changed diff --git a/.pylintrc b/.pylintrc index ac62243..d6dee4f 100644 --- a/.pylintrc +++ b/.pylintrc @@ -10,7 +10,7 @@ manifest-required-authors=Camptocamp manifest-required-keys=license manifest-deprecated-keys=description,active license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid-odoo-versions=17.0 +valid-odoo-versions=18.0 [MESSAGES CONTROL] disable=all diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index 3272fed..3458e28 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -9,7 +9,7 @@ manifest-required-authors=Camptocamp manifest-required-keys=license manifest-deprecated-keys=description,active license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid-odoo-versions=17.0 +valid-odoo-versions=18.0 [MESSAGES CONTROL] disable=all diff --git a/README.md b/README.md index b1b4f3d..8e8b46c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Pre-commit Status](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/pre-commit.yml/badge.svg?branch=17.0)](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/pre-commit.yml?query=branch%3A17.0) -[![Build Status](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/test.yml/badge.svg?branch=17.0)](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/test.yml?query=branch%3A17.0) -[![codecov](https://codecov.io/gh/camptocamp/odoo-cloud-platform/branch/17.0/graph/badge.svg)](https://codecov.io/gh/camptocamp/odoo-cloud-platform) +[![Pre-commit Status](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/pre-commit.yml/badge.svg?branch=18.0)](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/pre-commit.yml?query=branch%3A18.0) +[![Build Status](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/test.yml/badge.svg?branch=18.0)](https://github.com/camptocamp/odoo-cloud-platform/actions/workflows/test.yml?query=branch%3A18.0) +[![codecov](https://codecov.io/gh/camptocamp/odoo-cloud-platform/branch/18.0/graph/badge.svg)](https://codecov.io/gh/camptocamp/odoo-cloud-platform) diff --git a/base_fileurl_field/__manifest__.py b/base_fileurl_field/__manifest__.py index 51ea36f..3cc8485 100644 --- a/base_fileurl_field/__manifest__.py +++ b/base_fileurl_field/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Base FileURL Field", "summary": "Implementation of FileURL type fields", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "category": "Technical Settings", "author": "Camptocamp, Odoo Community Association (OCA)", "website": "https://github.com/camptocamp/odoo-cloud-platform", diff --git a/cloud_platform/__manifest__.py b/cloud_platform/__manifest__.py index 1473887..5c2539f 100644 --- a/cloud_platform/__manifest__.py +++ b/cloud_platform/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Cloud Platform", "summary": "Addons required for the Camptocamp Cloud Platform", - "version": "17.0.2.0.0", + "version": "18.0.1.0.0", "author": "Camptocamp,Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Extra Tools", diff --git a/monitoring_log_requests/__manifest__.py b/monitoring_log_requests/__manifest__.py index 5b4b937..8071143 100644 --- a/monitoring_log_requests/__manifest__.py +++ b/monitoring_log_requests/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Monitoring: Requests Logging", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "author": "Camptocamp,Numigi,Odoo Community Association (OCA)", "license": "AGPL-3", "category": "category", diff --git a/monitoring_statsd/__manifest__.py b/monitoring_statsd/__manifest__.py index f7b498f..bf48acf 100644 --- a/monitoring_statsd/__manifest__.py +++ b/monitoring_statsd/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Monitoring: Statsd Metrics", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "author": "Camptocamp,Odoo Community Association (OCA)", "license": "AGPL-3", "category": "category", diff --git a/test_base_fileurl_field/__manifest__.py b/test_base_fileurl_field/__manifest__.py index 4c885b0..b76174a 100644 --- a/test_base_fileurl_field/__manifest__.py +++ b/test_base_fileurl_field/__manifest__.py @@ -3,7 +3,7 @@ { "name": "test base fileurl fields", "summary": """A module to verify fileurl field.""", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "category": "Tests", "author": "Camptocamp,Odoo Community Association (OCA)", "website": "https://github.com/camptocamp/odoo-cloud-platform",