Skip to content

Commit

Permalink
Merge PR #482 into 17.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed May 1, 2024
2 parents 661e696 + c8ec6ab commit db3c20c
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.19
_commit: v1.21.1
_src_path: gh:oca/oca-addons-repo-template
additional_ruff_rules: []
ci: GitHub
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Stale PRs and issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# General settings.
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# * Issues that are pending more information
# * Except Issues marked as "no stale"
- name: Needs more information stale issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ascending: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
run: oca_init_test_database
- name: Run tests
run: oca_run_tests
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Update .pot files
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }}
6 changes: 4 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ exclude: |
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -41,7 +43,7 @@ repos:
hooks:
- id: whool-init
- repo: https://github.com/oca/maintainer-tools
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
Expand Down Expand Up @@ -110,7 +112,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19
rev: v9.0.4
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
1 change: 1 addition & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ fix = true
extend-select = [
"B",
"C90",
"E501", # line too long (default 88)
"I", # isort
"UP", # pyupgrade
]
Expand Down
3 changes: 2 additions & 1 deletion connector/components/binder.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ def unwrap_model(self):
column = self.model._fields[self._odoo_field]
except KeyError as err:
raise ValueError(
f"Cannot unwrap model {self.model._name}, because it has no {self._odoo_field} fields"
f"Cannot unwrap model {self.model._name}, because it has no "
f"{self._odoo_field} fields"
) from err
return column.comodel_name
3 changes: 2 additions & 1 deletion connector/components/locker.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ def lock(self, records, seconds=None, ignore_retry=True):
)
raise RetryableJobError(
"A concurrent job is already working on the same record "
f"({self.model._name} with one id in {tuple(records.ids)}). The job will be retried later.",
f"({self.model._name} with one id in {tuple(records.ids)}). The job "
f"will be retried later.",
seconds=seconds,
ignore_retry=ignore_retry,
) from err
3 changes: 2 additions & 1 deletion connector/components/synchronizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ def _lock(self):
)
raise RetryableJobError(
"A concurrent job is already exporting the same record "
f"({self.model._name} with id {self.binding.id}). The job will be retried later."
f"({self.model._name} with id {self.binding.id}). The job will be "
f"retried later."
) from err

def _has_to_skip(self):
Expand Down
2 changes: 1 addition & 1 deletion connector/tests/test_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def name(self):
pass

class FryMapperInherit(Component):
_inherit = "fry.mapper"
_inherit = "fry.mapper" # pylint: disable=R8180
_apply_on = "res.users"

@changed_by("email")
Expand Down

0 comments on commit db3c20c

Please sign in to comment.