Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.0] dotfiles update needs manual intervention #426

Merged
merged 2 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
6 changes: 3 additions & 3 deletions account_avatax_oca/models/account_tax.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ def compute_all(
avatax_amount = 0.0
raise exceptions.UserError(
_(
"Incorrect retrieval of Avatax amount for Invoice %(avatax_invoice)s:"
" product %(product.display_name)s, price_unit %(-price_unit)f"
" , quantity %(quantity)f"
"Incorrect retrieval of Avatax amount for Invoice "
"%(avatax_invoice)s: product %(product.display_name)s, "
"price_unit %(-price_unit)f , quantity %(quantity)f"
)
)
for tax_item in res["taxes"]:
Expand Down
10 changes: 6 additions & 4 deletions account_avatax_oca/models/avalara_salestax.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@

@api.depends("name", "code")
def _compute_display_name(self):
super()._compute_display_name()
res = super()._compute_display_name()

Check warning on line 20 in account_avatax_oca/models/avalara_salestax.py

View check run for this annotation

Codecov / codecov/patch

account_avatax_oca/models/avalara_salestax.py#L20

Added line #L20 was not covered by tests
for exemption in self:
exemption.display_name = (
exemption.code
and f"({exemption.code}) {exemption.name}"
or exemption.name
)
return res

Check warning on line 27 in account_avatax_oca/models/avalara_salestax.py

View check run for this annotation

Codecov / codecov/patch

account_avatax_oca/models/avalara_salestax.py#L27

Added line #L27 was not covered by tests


class AvalaraSalestax(models.Model):
Expand Down Expand Up @@ -93,8 +94,8 @@
help="No tax calculation requests will be sent to the AvaTax web service.",
)
# TODO: Control - Disable Document Recording
# In order for this connector to be used in conjunction
# with other integrations to AvaTax, the user must be able to control which connector
# In order for this connector to be used in conjunction with other integrations to
# AvaTax, the user must be able to control which connector
# is used for recording documents to AvaTax.
# From a technical standpoint, simply use DocType: 'SalesOrder' on all calls
# and suppress any non-getTax calls (i.e. cancelTax, postTax).
Expand Down Expand Up @@ -246,7 +247,8 @@
if not shipping_address.date_validation:
raise UserError(
_(
"Please validate the shipping address for the partner %(partner.name)s."
"Please validate the shipping address for the partner "
"%(partner.name)s."
)
)

Expand Down
Loading