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

[14.0] dotfiles update with manual intervention #772

Merged
merged 2 commits into from
Oct 30, 2023
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
6 changes: 2 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.17.2
_src_path: https://github.com/OCA/oca-addons-repo-template.git
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
Expand All @@ -19,6 +19,4 @@ repo_description: WMS modules for Odoo
repo_name: Warehouse Management System (WMS)
repo_slug: wms
repo_website: https://github.com/OCA/wms
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ globals:
Vuetify: readonly
shopfloor_app_info: readonly # defined templates/main.xml
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand All @@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -36,10 +36,10 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:9.6
Expand All @@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
16 changes: 15 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ exclude: |
lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: 969238e47c07d0c40573acff81d170f63245d738
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/OCA/wms"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=wms
- --if-source-changed
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
Expand Down
4 changes: 2 additions & 2 deletions shopfloor/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ msgstr "Ultima modifica il"
#, python-format
msgid "Last operation of transfer {}. Next operation ({}) is ready to proceed."
msgstr ""
"Ultima operazione del trasferimento {}. L'operazone sccessiva (}) è pronta a "
"Ultima operazione del trasferimento {}. L'operazone sccessiva ({}) è pronta a "
"procedere."

#. module: shopfloor
Expand Down Expand Up @@ -980,7 +980,7 @@ msgstr "Il collo {} non è nel trasferimento attuale."
#: code:addons/shopfloor/actions/message.py:0
#, python-format
msgid "Package {} not found in location {}"
msgstr "Il collo } non è stato trovato nell'ubicazione {}"
msgstr "Il collo {} non è stato trovato nell'ubicazione {}"

#. module: shopfloor
#: code:addons/shopfloor/actions/message.py:0
Expand Down
4 changes: 2 additions & 2 deletions stock_dynamic_routing/views/stock_routing_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<field name="active" invisible="1" />
<group string="Routing Rules" name="rule">
<field name="rule_ids" nolabel="1">
<tree string="Routing Rules">
<tree name="routing-rules">
<field name="sequence" widget="handle" />
<field name="method" />
<field name="picking_type_id" />
Expand Down Expand Up @@ -80,7 +80,7 @@
<field name="name">stock.routing</field>
<field name="model">stock.routing</field>
<field name="arch" type="xml">
<tree string="Dynamic Routing">
<tree name="dynamic-routing">
<field name="sequence" widget="handle" />
<field name="location_id" />
<field name="picking_type_id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<field name="name">stock.source.relocate</field>
<field name="model">stock.source.relocate</field>
<field name="arch" type="xml">
<tree string="Source Relocation">
<tree name="source-relocation">
<field name="sequence" widget="handle" />
<field name="location_id" />
<field name="picking_type_id" />
Expand Down
2 changes: 1 addition & 1 deletion stock_release_channel/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ msgstr "Trasferimenti disponibili"
#: code:addons/stock_release_channel/models/stock_release_channel.py:0
#, python-format
msgid "Channel %s has no validated transfer yet."
msgstr "Il canale %(name)s non ha ancora un trasferimento validato."
msgstr "Il canale %s non ha ancora un trasferimento validato."

#. module: stock_release_channel
#: model:ir.model.fields,field_description:stock_release_channel.field_stock_release_channel__color
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<field name="name">package.storage.location.tree.view</field>
<field name="model">stock.storage.location.sequence</field>
<field name="arch" type="xml">
<tree string="Storage locations" editable="bottom">
<tree name="storage-locations" editable="bottom">
<field name="sequence" widget="handle" />
<field
name="package_storage_type_id"
Expand Down
Loading