Skip to content

Commit c133750

Browse files
committed
[IMP] update dotfiles [ci skip]
1 parent d11bbbb commit c133750

7 files changed

+57
-59
lines changed

.copier-answers.yml

+4-1
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.3.6
2+
_commit: v1.5.2
33
_src_path: gh: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: 15.0
9+
org_name: Odoo Community Association (OCA)
10+
org_slug: OCA
911
rebel_module_groups: []
1012
repo_description: 'TODO: add repo description.'
1113
repo_name: delivery-carrier
1214
repo_slug: delivery-carrier
15+
repo_website: https://github.com/OCA/delivery-carrier
1316
travis_apt_packages: []
1417
travis_apt_sources: []

.eslintrc.yml

+1-1
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

+22-7
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,34 @@ name: pre-commit
22

33
on:
44
pull_request:
5+
branches:
6+
- "15.0*"
57
push:
8+
branches:
9+
- "15.0"
10+
- "15.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
18+
- name: Get python version
19+
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
20+
- uses: actions/cache@v1
1321
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.10"
20-
- uses: pre-commit/action@v2.0.0
22+
path: ~/.cache/pre-commit
23+
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
24+
- name: Install pre-commit
25+
run: pip install pre-commit
26+
- name: Run pre-commit
27+
run: pre-commit run --all-files --show-diff-on-failure --color=always
28+
- name: Check that all files generated by pre-commit are in git
29+
run: |
30+
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
31+
if [ "$newfiles" != "" ] ; then
32+
echo "Please check-in the following files:"
33+
echo "$newfiles"
34+
exit 1
35+
fi

.github/workflows/test.yml

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,45 @@
1-
name: test Odoo addons
1+
name: tests
22

33
on:
44
pull_request:
55
branches:
66
- "15.0*"
77
push:
88
branches:
9-
- "15.0*"
9+
- "15.0"
10+
- "15.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 }}
33+
name: ${{ matrix.name }}
1534
strategy:
1635
fail-fast: false
1736
matrix:
1837
include:
1938
- container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest
2039
makepot: "true"
40+
name: test with Odoo
2141
- container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
42+
name: test with OCB
2243
services:
2344
postgres:
2445
image: postgres:9.6

.pre-commit-config.yaml

+2-2
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: 21.9b0
49+
rev: 22.3.0
5050
hooks:
5151
- id: black
5252
- repo: https://github.com/pre-commit/mirrors-prettier
@@ -129,7 +129,7 @@ repos:
129129
- --exit-zero
130130
verbose: true
131131
additional_dependencies: &pylint_deps
132-
- pylint-odoo==5.0.4
132+
- pylint-odoo==5.0.5
133133
- id: pylint
134134
name: pylint with mandatory checks
135135
args:

.t2d.yml

-42
This file was deleted.

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/99/15.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-delivery-carrier-99)
2-
[![Build Status](https://travis-ci.com/OCA/delivery-carrier.svg?branch=15.0)](https://travis-ci.com/OCA/delivery-carrier)
1+
2+
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=15.0)
3+
[![Pre-commit Status](https://github.com/OCA/delivery-carrier/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)](https://github.com/OCA/delivery-carrier/actions/workflows/pre-commit.yml?query=branch%3A15.0)
4+
[![Build Status](https://github.com/OCA/delivery-carrier/actions/workflows/test.yml/badge.svg?branch=15.0)](https://github.com/OCA/delivery-carrier/actions/workflows/test.yml?query=branch%3A15.0)
35
[![codecov](https://codecov.io/gh/OCA/delivery-carrier/branch/15.0/graph/badge.svg)](https://codecov.io/gh/OCA/delivery-carrier)
46
[![Translation Status](https://translation.odoo-community.org/widgets/delivery-carrier-15-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/delivery-carrier-15-0/?utm_source=widget)
57

@@ -25,12 +27,11 @@ This part will be replaced when running the oca-gen-addons-table script from OCA
2527

2628
This repository is licensed under [AGPL-3.0](LICENSE).
2729

28-
However, each module can have a totally different license, as long as they adhere to OCA
30+
However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
2931
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
3032
that explains its license.
3133

3234
----
33-
3435
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
3536
organization whose mission is to support the collaborative development of Odoo features
3637
and promote its widespread use.

0 commit comments

Comments
 (0)