Skip to content

Commit 8c836f4

Browse files
authored
Merge pull request #427 from acsone/14.0-update-dotfiles-sbi
[14.0] update dotfiles
2 parents 1ad9112 + 210f6e4 commit 8c836f4

14 files changed

Lines changed: 140 additions & 123 deletions

File tree

.copier-answers.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.4.0
2+
_commit: v1.5.2
33
_src_path: git+https://github.com/OCA/oca-addons-repo-template
44
ci: GitHub
55
dependency_installation_mode: PIP
66
generate_requirements_txt: true
77
include_wkhtmltopdf: false
88
odoo_version: 14.0
9+
org_name: Odoo Community Association (OCA)
10+
org_slug: OCA
911
rebel_module_groups: []
1012
repo_description: null
1113
repo_name: MIS Builder
1214
repo_slug: mis-builder
15+
repo_website: https://github.com/OCA/mis-builder
1316
travis_apt_packages: []
1417
travis_apt_sources: []

.eslintrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44

55
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
66
parserOptions:
7-
ecmaVersion: 2017
7+
ecmaVersion: 2019
88

99
overrides:
1010
- files:

.github/workflows/pre-commit.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@ name: pre-commit
22

33
on:
44
pull_request:
5+
branches:
6+
- "14.0*"
57
push:
8+
branches:
9+
- "14.0"
10+
- "14.0-ocabot-*"
611

712
jobs:
813
pre-commit:
914
runs-on: ubuntu-latest
1015
steps:
1116
- uses: actions/checkout@v2
1217
- uses: actions/setup-python@v2
13-
with:
14-
# The pylint-odoo version we use here does not support python 3.10
15-
# https://github.com/OCA/oca-addons-repo-template/issues/80
16-
# We also need to pin to an older version of python for older odoo versions
17-
# where we are not using black > 21. Older black versions won't work with
18-
# Python 3.9.8+, and we can't bump black without reformatting.
19-
python-version: "3.9.7"
2018
- name: Get python version
2119
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2220
- uses: actions/cache@v1

.github/workflows/test.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,27 @@ on:
66
- "14.0*"
77
push:
88
branches:
9-
- "14.0*"
9+
- "14.0"
10+
- "14.0-ocabot-*"
1011

1112
jobs:
13+
unreleased-deps:
14+
runs-on: ubuntu-latest
15+
name: Detect unreleased dependencies
16+
steps:
17+
- uses: actions/checkout@v2
18+
- run: |
19+
for reqfile in requirements.txt test-requirements.txt ; do
20+
if [ -f ${reqfile} ] ; then
21+
result=0
22+
# reject non-comment lines that contain a / (i.e. URLs, relative paths)
23+
grep "^[^#].*/" ${reqfile} || result=$?
24+
if [ $result -eq 0 ] ; then
25+
echo "Unreleased dependencies found in ${reqfile}."
26+
exit 1
27+
fi
28+
fi
29+
done
1230
test:
1331
runs-on: ubuntu-latest
1432
container: ${{ matrix.container }}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ repos:
4646
- --remove-duplicate-keys
4747
- --remove-unused-variables
4848
- repo: https://github.com/psf/black
49-
rev: 20.8b1
49+
rev: 22.3.0
5050
hooks:
5151
- id: black
5252
- repo: https://github.com/pre-commit/mirrors-prettier
@@ -120,7 +120,7 @@ repos:
120120
name: flake8
121121
additional_dependencies: ["flake8-bugbear==20.1.4"]
122122
- repo: https://github.com/PyCQA/pylint
123-
rev: pylint-2.5.3
123+
rev: v2.11.1
124124
hooks:
125125
- id: pylint
126126
name: pylint with optional checks
@@ -129,7 +129,7 @@ repos:
129129
- --exit-zero
130130
verbose: true
131131
additional_dependencies: &pylint_deps
132-
- pylint-odoo==3.5.0
132+
- pylint-odoo==5.0.5
133133
- id: pylint
134134
name: pylint with mandatory checks
135135
args:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/mis-builder&target_branch=14.0)
23
[![Pre-commit Status](https://github.com/OCA/mis-builder/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/OCA/mis-builder/actions/workflows/pre-commit.yml?query=branch%3A14.0)
34
[![Build Status](https://github.com/OCA/mis-builder/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/OCA/mis-builder/actions/workflows/test.yml?query=branch%3A14.0)
@@ -65,12 +66,11 @@ addon | version | maintainers | summary
6566

6667
This repository is licensed under [AGPL-3.0](LICENSE).
6768

68-
However, each module can have a totally different license, as long as they adhere to OCA
69+
However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
6970
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
7071
that explains its license.
7172

7273
----
73-
7474
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
7575
organization whose mission is to support the collaborative development of Odoo features
7676
and promote its widespread use.

docs/conf.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
# -- Project information -----------------------------------------------------
2121

22-
project = u"MIS Builder"
22+
project = "MIS Builder"
2323
year = datetime.now().year
24-
copyright = u"%s, Odoo Community Association (OCA)" % year
25-
author = u"Odoo Community Association (OCA)"
24+
copyright = "%s, Odoo Community Association (OCA)" % year
25+
author = "Odoo Community Association (OCA)"
2626

2727
# The short X.Y version
28-
version = u"3.2"
28+
version = "3.2"
2929
# The full version, including alpha/beta/rc tags
3030
release = version
3131

@@ -63,7 +63,7 @@
6363
# List of patterns, relative to source directory, that match files and
6464
# directories to ignore when looking for source files.
6565
# This pattern also affects html_static_path and html_extra_path .
66-
exclude_patterns = [u"_build", "Thumbs.db", ".DS_Store"]
66+
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
6767

6868
# The name of the Pygments (syntax highlighting) style to use.
6969
pygments_style = "sphinx"
@@ -145,8 +145,8 @@
145145
(
146146
master_doc,
147147
"MISBuilder.tex",
148-
u"MIS Builder Documentation",
149-
u"Odoo Community Association (OCA)",
148+
"MIS Builder Documentation",
149+
"Odoo Community Association (OCA)",
150150
"manual",
151151
)
152152
]
@@ -156,7 +156,7 @@
156156

157157
# One entry per manual page. List of tuples
158158
# (source start file, name, description, authors, manual section).
159-
man_pages = [(master_doc, "misbuilder", u"MIS Builder Documentation", [author], 1)]
159+
man_pages = [(master_doc, "misbuilder", "MIS Builder Documentation", [author], 1)]
160160

161161

162162
# -- Options for Texinfo output ----------------------------------------------
@@ -168,7 +168,7 @@
168168
(
169169
master_doc,
170170
"MISBuilder",
171-
u"MIS Builder Documentation",
171+
"MIS Builder Documentation",
172172
author,
173173
"MISBuilder",
174174
"One line description of project.",

mis_builder/models/kpimatrix.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,13 @@ def set_values_detail_account(
244244
self.lang, row.style_props, kpi.type, val
245245
)
246246
if row.kpi.multi and subcol.subkpi:
247-
val_comment = u"{}.{} = {}".format(
247+
val_comment = "{}.{} = {}".format(
248248
row.kpi.name,
249249
subcol.subkpi.name,
250250
row.kpi._get_expression_str_for_subkpi(subcol.subkpi),
251251
)
252252
else:
253-
val_comment = u"{} = {}".format(row.kpi.name, row.kpi.expression)
253+
val_comment = "{} = {}".format(row.kpi.name, row.kpi.expression)
254254
cell_style_props = row.style_props
255255
if row.kpi.style_expression:
256256
# evaluate style expression
@@ -313,7 +313,7 @@ def compute_comparisons(self):
313313
)
314314
)
315315
if not label:
316-
label = u"{} vs {}".format(col.label, base_col.label)
316+
label = "{} vs {}".format(col.label, base_col.label)
317317
comparison_col = KpiMatrixCol(
318318
cmpcol_key,
319319
label,
@@ -470,9 +470,9 @@ def _load_account_names(self):
470470
self._account_names = {a.id: self._get_account_name(a) for a in accounts}
471471

472472
def _get_account_name(self, account):
473-
result = u"{} {}".format(account.code, account.name)
473+
result = "{} {}".format(account.code, account.name)
474474
if self._multi_company:
475-
result = u"{} [{}]".format(result, account.company_id.name)
475+
result = "{} [{}]".format(result, account.company_id.name)
476476
return result
477477

478478
def get_account_name(self, account_id):

mis_builder/models/mis_kpi_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def _compute_name(self):
6262
subkpi_name = "." + subkpi_name
6363
else:
6464
subkpi_name = ""
65-
rec.name = u"{}{}: {} - {}".format(
65+
rec.name = "{}{}: {} - {}".format(
6666
rec.kpi_expression_id.kpi_id.name,
6767
subkpi_name,
6868
rec.date_from,

mis_builder/models/mis_report.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class MisReportKpi(models.Model):
144144
def name_get(self):
145145
res = []
146146
for rec in self:
147-
name = u"{} ({})".format(rec.description, rec.name)
147+
name = "{} ({})".format(rec.description, rec.name)
148148
res.append((rec.id, name))
149149
return res
150150

@@ -171,7 +171,7 @@ def _compute_expression(self):
171171
for expression in kpi.expression_ids:
172172
if expression.subkpi_id:
173173
exprs.append(
174-
u"{}\xa0=\xa0{}".format(
174+
"{}\xa0=\xa0{}".format(
175175
expression.subkpi_id.name, expression.name
176176
)
177177
)
@@ -308,7 +308,7 @@ def name_get(self):
308308
kpi = rec.kpi_id
309309
subkpi = rec.subkpi_id
310310
if subkpi:
311-
name = u"{} / {} ({}.{})".format(
311+
name = "{} / {} ({}.{})".format(
312312
kpi.description, subkpi.description, kpi.name, subkpi.name
313313
)
314314
else:

0 commit comments

Comments
 (0)