Skip to content

Commit

Permalink
Updated from template
Browse files Browse the repository at this point in the history
  • Loading branch information
ivs-cetmix committed Nov 20, 2023
1 parent b6dbb76 commit d8eef33
Show file tree
Hide file tree
Showing 46 changed files with 233 additions and 159 deletions.
11 changes: 7 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.7.0-92-g8a58cca
_commit: v1.7.0-173-ge408f2a
_src_path: https://github.com/cetmix/cetmix-addons-repo-template.git
additional_ruff_rules: []
ci: GitHub
dependency_installation_mode: OCA
convert_readme_fragments_to_markdown: false
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
github_enable_codecov: true
github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
github_odoo_ee: false
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0
org_name: Cetmix
org_slug: cetmix
Expand All @@ -19,6 +22,6 @@ repo_description: Cetmix Tower
repo_name: Remote server management tools
repo_slug: cetmix-tower
repo_website: https://cetmix.com
travis_apt_packages: []
travis_apt_sources: []
use_pyproject_toml: false
use_ruff: true

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/cetmix/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
12 changes: 0 additions & 12 deletions .flake8

This file was deleted.

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
5 changes: 3 additions & 2 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 @@ -40,6 +40,7 @@ jobs:
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 @@ -52,7 +53,7 @@ jobs:
env:
RUNBOAT_GITHUB_TOKEN: ${{ secrets.GIT_PUSH_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
/.ruff_cache

# C extensions
*.so
Expand Down
13 changes: 0 additions & 13 deletions .isort.cfg

This file was deleted.

48 changes: 21 additions & 27 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ exclude: |
/static/(src/)?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)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -33,27 +37,25 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://cetmix.com"]
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
- id: autoflake
- id: oca-gen-addon-readme
args:
- --expand-star-imports
- --ignore-init-module-imports
- --in-place
- --remove-all-unused-imports
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 22.3.0
- --addons-dir=.
- --branch=14.0
- --org-name=cetmix
- --repo-name=cetmix-tower
- --if-source-changed
- --keep-source-digest
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: black
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.1.2
hooks:
Expand Down Expand Up @@ -100,14 +102,6 @@ repos:
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
args:
- --settings=.
exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo
rev: 3.1.8
hooks:
Expand All @@ -118,12 +112,12 @@ repos:
- requirements.txt
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.3
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
hooks:
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme_template_url="https://github.com/cetmix/maintainer-tools/blob/master/temp
manifest_required_authors=Cetmix
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=OPL-1,AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
license_allowed=OPL-1,AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,AGPL-3
valid_odoo_versions=14.0

[MESSAGES CONTROL]
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc-mandatory
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme_template_url="https://github.com/cetmix/maintainer-tools/blob/master/temp
manifest_required_authors=Cetmix
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=OPL-1,AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
license_allowed=OPL-1,AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,AGPL-3
valid_odoo_versions=14.0

[MESSAGES CONTROL]
Expand Down
28 changes: 28 additions & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

fix = true

[lint]
extend-select = [
"B",
"C90",
"E501", # line too long (default 88)
"I", # isort
]
exclude = ["setup/*"]

[format]
exclude = ["setup/*"]

[per-file-ignores]
"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
"__manifest__.py" = ["B018"] # useless expression

[isort]
section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]

[isort.sections]
"odoo" = ["odoo"]
"odoo-addons" = ["odoo.addons"]

[mccabe]
max-complexity = 16
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM my-odoo:14.0

# Install project related modules
RUN python3.7 -m pip install paramiko
RUN python3.10 -m pip install paramiko
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.cetmix.com/builds?repo=cetmix/cetmix-tower&target_branch=14.0)
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.cetmix.com/webui/builds.html?repo=cetmix/cetmix-tower&target_branch=14.0)
[![Pre-commit Status](https://github.com/cetmix/cetmix-tower/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/cetmix/cetmix-tower/actions/workflows/pre-commit.yml?query=branch%3A14.0)
[![Build Status](https://github.com/cetmix/cetmix-tower/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/cetmix/cetmix-tower/actions/workflows/test.yml?query=branch%3A14.0)
[![codecov](https://codecov.io/gh/cetmix/cetmix-tower/branch/14.0/graph/badge.svg)](https://codecov.io/gh/cetmix/cetmix-tower)
Expand Down
2 changes: 1 addition & 1 deletion cetmix_tower_file/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"category": "Productivity",
"website": "https://cetmix.com",
"author": "Cetmix",
"license": "LGPL-3",
"license": "AGPL-3",
"application": True,
"installable": True,
"external_dependencies": {
Expand Down
18 changes: 9 additions & 9 deletions cetmix_tower_file/models/cx_tower_file.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
# Copyright (C) 2022 Cetmix OÜ
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from dateutil.relativedelta import relativedelta

from odoo import _, api, fields, models
Expand Down Expand Up @@ -277,9 +278,8 @@ def action_get_current_server_code(self):
if file.source != "tower":
raise UserError(
_(
"The file shouldn't have the {} source to download from server!".format(
file.source
)
"The file shouldn't have the {} source to download "
"from server!".format(file.source)
)
)
code = self.with_context(is_server_code_version_process=True)._process(
Expand Down Expand Up @@ -319,9 +319,8 @@ def _process(self, action, raise_error=True):
if raise_error:
raise UserError(
_(
"The file shouldn't have the {} source to {} from server!".format(
file.source, action
)
"The file shouldn't have the {} source to {} "
"from server!".format(file.source, action)
)
)
return False
Expand Down Expand Up @@ -350,7 +349,7 @@ def _process(self, action, raise_error=True):
file.rendered_name, exception_to_unicode(error)
)
)
)
) from error
file.sync_code = repr(error)

if not is_server_code_version_process:
Expand All @@ -359,7 +358,8 @@ def _process(self, action, raise_error=True):
@api.model
def _get_tower_sync_field_names(self):
"""
Return the list of field names to start synchronization after changing these fields
Return the list of field names to start synchronization
after changing these fields
"""
return ["name", "server_dir", "code"]

Expand Down
4 changes: 2 additions & 2 deletions cetmix_tower_file/models/cx_tower_file_template.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

# Copyright (C) 2022 Cetmix OÜ
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models


Expand Down
5 changes: 3 additions & 2 deletions cetmix_tower_file/models/cx_tower_server.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
# Copyright (C) 2022 Cetmix OÜ
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import ast

from odoo import fields, models
Expand Down Expand Up @@ -34,7 +35,7 @@ def action_open_files(self):
action["domain"] = [("server_id", "=", self.id)]

context = self._context.copy()
if "context" in action and type(action["context"]) == str:
if "context" in action and isinstance((action["context"]), str):
context.update(ast.literal_eval(action["context"]))
else:
context.update(action.get("context", {}))
Expand Down
2 changes: 1 addition & 1 deletion cetmix_tower_file/views/cx_tower_file_template_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<field name="name">cx.tower.file.template.view.tree</field>
<field name="model">cx.tower.file.template</field>
<field name="arch" type="xml">
<tree string="Templates">
<tree>
<field name="name" />
<field name="file_name" optional="show" />
<field name="server_dir" optional="show" />
Expand Down
2 changes: 1 addition & 1 deletion cetmix_tower_file/views/cx_tower_file_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<field name="name">cx.tower.file.view.tree</field>
<field name="model">cx.tower.file</field>
<field name="arch" type="xml">
<tree string="Files">
<tree>
<field name="rendered_name" />
<field name="source" />
<field name="server_id" />
Expand Down
Loading

0 comments on commit d8eef33

Please sign in to comment.