[IMP] update dotfiles
oca-git-bot
parent
94d2bb5d50
commit
47d914f73f
|
|
@ -1,14 +1,17 @@
|
|||
# Do NOT update manually; changes here will be overwritten by Copier
|
||||
_commit: v1.3.6
|
||||
_commit: v1.5.2
|
||||
_src_path: gh:oca/oca-addons-repo-template
|
||||
ci: GitHub
|
||||
dependency_installation_mode: PIP
|
||||
generate_requirements_txt: true
|
||||
include_wkhtmltopdf: false
|
||||
odoo_version: 15.0
|
||||
org_name: Odoo Community Association (OCA)
|
||||
org_slug: OCA
|
||||
rebel_module_groups: []
|
||||
repo_description: 'TODO: add repo description.'
|
||||
repo_name: server-tools
|
||||
repo_slug: server-tools
|
||||
repo_website: https://github.com/OCA/server-tools
|
||||
travis_apt_packages: []
|
||||
travis_apt_sources: []
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ env:
|
|||
|
||||
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
|
||||
parserOptions:
|
||||
ecmaVersion: 2017
|
||||
ecmaVersion: 2019
|
||||
|
||||
overrides:
|
||||
- files:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,12 @@ name: pre-commit
|
|||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- "15.0*"
|
||||
push:
|
||||
branches:
|
||||
- "15.0"
|
||||
- "15.0-ocabot-*"
|
||||
|
||||
jobs:
|
||||
pre-commit:
|
||||
|
|
@ -10,11 +15,21 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-python@v2
|
||||
- name: Get python version
|
||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||
- uses: actions/cache@v1
|
||||
with:
|
||||
# The pylint-odoo version we use here does not support python 3.10
|
||||
# https://github.com/OCA/oca-addons-repo-template/issues/80
|
||||
# We also need to pin to an older version of python for older odoo versions
|
||||
# where we are not using black > 21. Older black versions won't work with
|
||||
# Python 3.9.8+, and we can't bump black without reformatting.
|
||||
python-version: "3.10"
|
||||
- uses: pre-commit/action@v2.0.0
|
||||
path: ~/.cache/pre-commit
|
||||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
- name: Install pre-commit
|
||||
run: pip install pre-commit
|
||||
- name: Run pre-commit
|
||||
run: pre-commit run --all-files --show-diff-on-failure --color=always
|
||||
- name: Check that all files generated by pre-commit are in git
|
||||
run: |
|
||||
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
|
||||
if [ "$newfiles" != "" ] ; then
|
||||
echo "Please check-in the following files:"
|
||||
echo "$newfiles"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
name: test Odoo addons
|
||||
name: tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
|
@ -6,19 +6,40 @@ on:
|
|||
- "15.0*"
|
||||
push:
|
||||
branches:
|
||||
- "15.0*"
|
||||
- "15.0"
|
||||
- "15.0-ocabot-*"
|
||||
|
||||
jobs:
|
||||
unreleased-deps:
|
||||
runs-on: ubuntu-latest
|
||||
name: Detect unreleased dependencies
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
for reqfile in requirements.txt test-requirements.txt ; do
|
||||
if [ -f ${reqfile} ] ; then
|
||||
result=0
|
||||
# reject non-comment lines that contain a / (i.e. URLs, relative paths)
|
||||
grep "^[^#].*/" ${reqfile} || result=$?
|
||||
if [ $result -eq 0 ] ; then
|
||||
echo "Unreleased dependencies found in ${reqfile}."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
container: ${{ matrix.container }}
|
||||
name: ${{ matrix.name }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest
|
||||
makepot: "true"
|
||||
name: test with Odoo
|
||||
- container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
|
||||
name: test with OCB
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:9.6
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ repos:
|
|||
- --remove-duplicate-keys
|
||||
- --remove-unused-variables
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 21.9b0
|
||||
rev: 22.3.0
|
||||
hooks:
|
||||
- id: black
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
|
|
@ -129,7 +129,7 @@ repos:
|
|||
- --exit-zero
|
||||
verbose: true
|
||||
additional_dependencies: &pylint_deps
|
||||
- pylint-odoo==5.0.4
|
||||
- pylint-odoo==5.0.5
|
||||
- id: pylint
|
||||
name: pylint with mandatory checks
|
||||
args:
|
||||
|
|
|
|||
42
.t2d.yml
42
.t2d.yml
|
|
@ -1,42 +0,0 @@
|
|||
language: python
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.cache/pip
|
||||
- $HOME/.cache/pre-commit
|
||||
|
||||
python:
|
||||
- "3.8"
|
||||
|
||||
addons:
|
||||
postgresql: "9.6"
|
||||
apt:
|
||||
packages:
|
||||
- expect-dev # provides unbuffer utility
|
||||
|
||||
stages:
|
||||
- test
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- stage: test
|
||||
env:
|
||||
- TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1"
|
||||
- stage: test
|
||||
env:
|
||||
- TESTS=1 ODOO_REPO="OCA/OCB"
|
||||
env:
|
||||
global:
|
||||
- VERSION="15.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
|
||||
|
||||
script:
|
||||
- travis_run_tests
|
||||
|
||||
after_success:
|
||||
- travis_after_tests_success
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
[](https://runbot.odoo-community.org/runbot/repo/github-com-oca-server-tools-149)
|
||||
[](https://travis-ci.com/OCA/server-tools)
|
||||
|
||||
[](https://runboat.odoo-community.org/builds?repo=OCA/server-tools&target_branch=15.0)
|
||||
[](https://github.com/OCA/server-tools/actions/workflows/pre-commit.yml?query=branch%3A15.0)
|
||||
[](https://github.com/OCA/server-tools/actions/workflows/test.yml?query=branch%3A15.0)
|
||||
[](https://codecov.io/gh/OCA/server-tools)
|
||||
[](https://translation.odoo-community.org/engage/server-tools-15-0/?utm_source=widget)
|
||||
|
||||
|
|
@ -39,12 +41,11 @@ addon | version | maintainers | summary
|
|||
|
||||
This repository is licensed under [AGPL-3.0](LICENSE).
|
||||
|
||||
However, each module can have a totally different license, as long as they adhere to OCA
|
||||
However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
|
||||
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
|
||||
that explains its license.
|
||||
|
||||
----
|
||||
|
||||
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
|
||||
organization whose mission is to support the collaborative development of Odoo features
|
||||
and promote its widespread use.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class IrFieldsConverter(models.AbstractModel):
|
|||
|
||||
@api.model
|
||||
def text_from_html(
|
||||
self, html_content, max_words=None, max_chars=None, ellipsis=u"…", fail=False
|
||||
self, html_content, max_words=None, max_chars=None, ellipsis="…", fail=False
|
||||
):
|
||||
"""Extract text from an HTML field in a generator.
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ class IrFieldsConverter(models.AbstractModel):
|
|||
return ""
|
||||
|
||||
# Get words
|
||||
words = u"".join(doc.xpath("//text()")).split()
|
||||
words = "".join(doc.xpath("//text()")).split()
|
||||
|
||||
# Truncate words
|
||||
suffix = max_words and len(words) > max_words
|
||||
|
|
@ -60,7 +60,7 @@ class IrFieldsConverter(models.AbstractModel):
|
|||
words = words[:max_words]
|
||||
|
||||
# Get text
|
||||
text = u" ".join(words)
|
||||
text = " ".join(words)
|
||||
|
||||
# Truncate text
|
||||
suffix = suffix or max_chars and len(text) > max_chars
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class ExtractorCase(TransactionCase):
|
|||
|
||||
def test_excerpts(self):
|
||||
"""Text gets correctly extracted."""
|
||||
html = u"""
|
||||
html = """
|
||||
<html>
|
||||
<body>
|
||||
<div class="this should not appear">
|
||||
|
|
@ -28,17 +28,17 @@ class ExtractorCase(TransactionCase):
|
|||
"""
|
||||
self.assertEqual(
|
||||
self.text_from_html(html),
|
||||
u"I'm a title I'm a paragraph ¡Pues yo soy español!",
|
||||
"I'm a title I'm a paragraph ¡Pues yo soy español!",
|
||||
)
|
||||
self.assertEqual(
|
||||
self.text_from_html(html, 8), u"I'm a title I'm a paragraph ¡Pues yo…"
|
||||
self.text_from_html(html, 8), "I'm a title I'm a paragraph ¡Pues yo…"
|
||||
)
|
||||
self.assertEqual(
|
||||
self.text_from_html(html, 8, 31), u"I'm a title I'm a paragraph ¡P…"
|
||||
self.text_from_html(html, 8, 31), "I'm a title I'm a paragraph ¡P…"
|
||||
)
|
||||
self.assertEqual(
|
||||
self.text_from_html(html, 7, ellipsis=""),
|
||||
u"I'm a title I'm a paragraph ¡Pues",
|
||||
"I'm a title I'm a paragraph ¡Pues",
|
||||
)
|
||||
|
||||
@mute_logger("odoo.addons.html_text.models.ir_fields_converter")
|
||||
|
|
|
|||
Loading…
Reference in New Issue