Skip to content

Commit

Permalink
Merge branch 'master' into support_private_repo
Browse files Browse the repository at this point in the history
  • Loading branch information
ivs-cetmix authored Mar 17, 2024
2 parents a335dbf + 6052e1a commit 7a1d059
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/psf/black
rev: 23.12.0
rev: 24.2.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand All @@ -23,7 +23,7 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/pycqa/flake8
rev: 6.1.0
rev: 7.0.0
hooks:
- id: flake8
name: flake8 except __init__.py
Expand All @@ -34,7 +34,7 @@ repos:
args: [--extend-ignore=F401] # ignore imported unused in __init__.py
files: __init__.py
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
rev: v3.15.1
hooks:
- id: pyupgrade
- repo: https://github.com/asottile/seed-isort-config
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN set -x \
&& python3 -m venv /ocamt \
&& /ocamt/bin/pip install --no-cache-dir -U pip wheel
RUN set -x \
&& /ocamt/bin/pip install --no-cache-dir -e git+https://github.com/OCA/maintainer-tools@9f4ee020d9cc6024ed6d9395fea9d9c894db632f#egg=oca-maintainers-tools \
&& /ocamt/bin/pip install --no-cache-dir -e git+https://github.com/OCA/maintainer-tools@400ffa99242c8b225ab4d34de78721a68b292a61#egg=oca-maintainers-tools \
&& ln -s /ocamt/bin/oca-gen-addons-table /usr/local/bin/ \
&& ln -s /ocamt/bin/oca-gen-addon-readme /usr/local/bin/ \
&& ln -s /ocamt/bin/oca-gen-metapackage /usr/local/bin/ \
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ pytest-asyncio==0.19.0
pytest-cov==4.0.0
pytest-mock==3.9.0
pytest-vcr==1.0.2
PyYAML==6.0
pyyaml==6.0
vcrpy==4.2.1
wrapt==1.15.0
21 changes: 13 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,32 @@ click-didyoumean==0.3.0
click-plugins==1.1.1
click-repl==0.2.0
commonmark==0.9.1
cryptography==41.0.6
cryptography==42.0.4
docutils==0.19
flower==1.2.0
frozenlist==1.3.1
gidgethub==5.2.0
github3.py==3.2.0
github3-py==3.2.0
humanize==4.4.0
idna==3.4
importlib-metadata==5.0.0
jaraco.classes==3.2.3
importlib-resources==6.3.1
jaraco-classes==3.2.3
jeepney==0.8.0
keyring==23.9.3
kombu==5.2.4
lxml==4.9.1
manifestoo-core==1.5
more-itertools==8.14.0
multidict==6.0.2
OdooRPC==0.8.0
odoorpc==0.8.0
packaging==23.1
pkginfo==1.8.3
prometheus-client==0.14.1
prompt-toolkit==3.0.31
pycparser==2.21
Pygments==2.15.0
PyJWT==2.5.0
pygments==2.15.0
pyjwt==2.5.0
python-dateutil==2.8.2
pytz==2022.4
raven==6.10.0
Expand All @@ -49,19 +51,22 @@ requests==2.31.0
requests-toolbelt==0.9.1
rfc3986==2.0.0
rich==12.5.1
SecretStorage==3.3.3
secretstorage==3.3.3
setuptools==56.0.0
setuptools-odoo==3.1.6
setuptools-scm==7.0.5
six==1.16.0
tomli==2.0.1
tornado==6.3.3
twine==4.0.1
types-cryptography==3.3.23
typing_extensions==4.3.0
typing-extensions==4.3.0
uritemplate==4.1.1
urllib3==1.26.18
vine==5.0.0
wcwidth==0.2.5
webencodings==0.5.1
wheel==0.43.0
whool==1.0
yarl==1.8.1
zipp==3.8.1

0 comments on commit 7a1d059

Please sign in to comment.