Skip to content

Commit

Permalink
Merge commit 'refs/pull/95/head' of https://github.com/oca/wms into 1…
Browse files Browse the repository at this point in the history
…0.0-alc_master
  • Loading branch information
lmignon committed Sep 6, 2021
2 parents 02d11f8 + 2e87354 commit 69dcea8
Show file tree
Hide file tree
Showing 645 changed files with 72,721 additions and 68,882 deletions.
15 changes: 15 additions & 0 deletions .copier-answers.yml
@@ -0,0 +1,15 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.1.3
_src_path: https://github.com/OCA/oca-addons-repo-template.git
dependency_installation_mode: PIP
generate_requirements_txt: true
include_wkhtmltopdf: false
odoo_version: 13.0
rebel_module_groups: []
repo_description: Warehouse Management System for advance logistic with Odoo
repo_name: WMS
repo_slug: wms
travis_apt_packages:
- cups
- libcups2-dev
travis_apt_sources: []
13 changes: 13 additions & 0 deletions .github/workflows/pre-commit.yml
@@ -0,0 +1,13 @@
name: pre-commit

on:
pull_request:
push:

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
6 changes: 2 additions & 4 deletions .gitignore
@@ -1,9 +1,8 @@
# Project specific
oca.cfg

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
/.venv
/.pytest_cache

# C extensions
*.so
Expand Down Expand Up @@ -40,7 +39,6 @@ coverage.xml

# Translations
*.mo
*.pot

# Pycharm
.idea
Expand Down
111 changes: 82 additions & 29 deletions .pre-commit-config.yaml
@@ -1,7 +1,39 @@
exclude: |
(?x)
# NOT INSTALLABLE ADDONS
^delivery_carrier_preference/|
^delivery_carrier_warehouse/|
^delivery_preference_glue_stock_picking_group/|
^sale_stock_available_to_promise_release/|
^shopfloor/|
^shopfloor_base/|
^shopfloor_batch_automatic_creation/|
^shopfloor_checkout_sync/|
^shopfloor_example/|
^shopfloor_mobile/|
^shopfloor_mobile_base/|
^shopfloor_packing_info/|
^shopfloor_rest_log/|
^shopfloor_workstation/|
^shopfloor_workstation_mobile/|
^stock_available_to_promise_release/|
^stock_available_to_promise_release_dynamic_routing/|
^stock_checkout_sync/|
^stock_dynamic_routing/|
^stock_dynamic_routing_checkout_sync/|
^stock_dynamic_routing_reserve_rule/|
^stock_move_source_relocate/|
^stock_move_source_relocate_dynamic_routing/|
^stock_picking_type_shipping_policy/|
^stock_picking_type_shipping_policy_group_by/|
^stock_reception_screen/|
^stock_storage_type_buffer/|
^stock_storage_type_putaway_abc/|
# END NOT INSTALLABLE ADDONS
# Files and folders generated by bots, to avoid loops
^setup/|/static/description/index\.html$|
# We don't want to mess with tool-generated files
.svg$|
# Maybe reactivate this when all README files include prettier ignore tags?
^README\.md$|
# Library files can have extraneous formatting (even minimized)
Expand All @@ -14,26 +46,42 @@ default_language_version:
python: python3
node: "14.13.0"
repos:
- repo: local
hooks:
# These files are most likely copier diff rejection junks; if found,
# review them manually, fix the problem (if needed) and remove them
- id: forbidden-files
name: forbidden files
entry: found forbidden files; remove them
language: fail
files: "\\.rej$"
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
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"]
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
- id: autoflake
args: ["-i", "--ignore-init-module-imports"]
- repo: https://github.com/psf/black
rev: 19.10b0
hooks:
- id: black
language_version: python3
- repo: https://github.com/prettier/pre-commit
rev: "v1.19.1"
hooks:
- id: prettier
# TODO Avoid awebdeveloper/pre-commit-prettier if possible
# HACK https://github.com/prettier/prettier/issues/7407
- repo: https://github.com/awebdeveloper/pre-commit-prettier
rev: v0.0.1
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v1.19.1
hooks:
- id: prettier
name: prettier xml plugin
name: prettier (with plugin-xml)
entry: prettier --write --list-different
additional_dependencies:
- "prettier@1.19.1"
- "@prettier/plugin-xml@0.7.2"
files: \.xml$
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v6.8.0
hooks:
Expand All @@ -45,7 +93,7 @@ repos:
# SPECIAL CASE: barcode scanner app use Vue.js +
# advanced JS (modules, classes, etc)
# which are not supported by OCA rules yet.
exclude: shopfloor_mobile/*
exclude: shopfloor_*/*
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0
hooks:
Expand All @@ -66,6 +114,21 @@ repos:
- id: check-xml
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v1.26.2
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/pre-commit/mirrors-isort
rev: v4.3.21
hooks:
- id: isort
name: isort except __init__.py
exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo
rev: 2.5.2
hooks:
- id: setuptools-odoo-make-default
- repo: https://gitlab.com/pycqa/flake8
rev: 3.7.9
hooks:
Expand All @@ -82,24 +145,14 @@ repos:
hooks:
- id: pylint
name: pylint with optional checks
args: ["--rcfile=.pylintrc", "--exit-zero"]
args:
- --rcfile=.pylintrc
- --exit-zero
verbose: true
additional_dependencies: ["pylint-odoo==3.5.0"]
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- id: pylint
name: pylint with mandatory checks
args: ["--rcfile=.pylintrc-mandatory"]
additional_dependencies: ["pylint-odoo==3.5.0"]
- repo: https://github.com/asottile/pyupgrade
rev: v1.26.2
hooks:
- id: pyupgrade
- repo: https://github.com/pre-commit/mirrors-isort
rev: v4.3.21
hooks:
- id: isort
name: isort except __init__.py
exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo
rev: 2.5.2
hooks:
- id: setuptools-odoo-make-default
args:
- --rcfile=.pylintrc-mandatory
additional_dependencies: *pylint_deps
2 changes: 1 addition & 1 deletion .prettierrc.yml
Expand Up @@ -5,4 +5,4 @@ printWidth: 88
proseWrap: always
semi: true
trailingComma: "es5"
xmlWhitespaceSensitivity: "ignore"
xmlWhitespaceSensitivity: "strict"
4 changes: 2 additions & 2 deletions .pylintrc
Expand Up @@ -46,8 +46,6 @@ enable=anomalous-backslash-in-string,
method-inverse,
method-required-super,
method-search,
missing-import-error,
missing-manifest-dependency,
openerp-exception-warning,
pointless-statement,
pointless-string-statement,
Expand All @@ -73,6 +71,7 @@ enable=anomalous-backslash-in-string,
deprecated-module,
file-not-used,
invalid-commit,
missing-manifest-dependency,
missing-newline-extrafiles,
missing-readme,
no-utf8-coding-comment,
Expand All @@ -82,6 +81,7 @@ enable=anomalous-backslash-in-string,
too-complex,
unnecessary-utf8-coding-comment


[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
output-format=colorized
Expand Down
2 changes: 0 additions & 2 deletions .pylintrc-mandatory
Expand Up @@ -39,8 +39,6 @@ enable=anomalous-backslash-in-string,
method-inverse,
method-required-super,
method-search,
missing-import-error,
missing-manifest-dependency,
openerp-exception-warning,
pointless-statement,
pointless-string-statement,
Expand Down
18 changes: 5 additions & 13 deletions .travis.yml
Expand Up @@ -12,38 +12,30 @@ addons:
apt:
packages:
- expect-dev # provides unbuffer utility
- "cups"
- "libcups2-dev"

stages:
- linting
- test

jobs:
include:
- stage: linting
name: "pre-commit"
python: 3.6
before_install:
install: pip install pre-commit
script: pre-commit run --all --show-diff-on-failure --verbose --color always
after_success:
- stage: test
env:
- TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" MQT_DEP="PIP"
- TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1"
- stage: test
env:
- TESTS="1" ODOO_REPO="OCA/OCB" MQT_DEP="PIP"

- TESTS=1 ODOO_REPO="OCA/OCB"
env:
global:
- VERSION="10.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
- MQT_DEP=PIP

install:
- git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git
${HOME}/maintainer-quality-tools
- export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
- travis_install_nightly
# Requirements to test server_environment modules
- printf '[options]\n\nrunning_env = dev\n' > ${HOME}/.openerp_serverrc

script:
- travis_run_tests
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
@@ -1,8 +1,10 @@
# OCA Guidelines

Please follow the official guide from the
[OCA Guidelines page](https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md).
[OCA Guidelines page](https://odoo-community.org/page/contributing).

## Project Specific Guidelines

<!-- /!\ do not modify above this line -->

This project does not have specific coding guidelines.
12 changes: 6 additions & 6 deletions LICENSE
@@ -1,7 +1,7 @@
GNU AFFERO GENERAL PUBLIC LICENSE
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -633,8 +633,8 @@ the "copyright" line and a pointer to where the full notice is found.
Copyright (C) <year> <name of author>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
Expand All @@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

0 comments on commit 69dcea8

Please sign in to comment.