chg: [dependencies] Fixed conflict in poetry.lock

This commit is contained in:
Cédric Bonhomme 2023-02-25 10:29:14 +01:00
commit e2fe642e3d
No known key found for this signature in database
GPG key ID: A1CB94DE57B7A70D
3 changed files with 37 additions and 3 deletions

34
.pre-commit-config.yaml Normal file
View file

@ -0,0 +1,34 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.1
hooks:
- id: pyupgrade
args: ["--py37-plus"]
- repo: https://github.com/asottile/reorder_python_imports
rev: v3.0.1
hooks:
- id: reorder-python-imports
additional_dependencies: ["setuptools>60.9"]
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear
- flake8-implicit-str-concat
args: ["--max-line-length=100"]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: fix-byte-order-marker
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/trailofbits/pip-audit
rev: v2.4.13
hooks:
- id: pip-audit
args: ["--ignore-vuln", "PYSEC-2022-203"]

2
poetry.lock generated
View file

@ -933,4 +933,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more
[metadata] [metadata]
lock-version = "2.0" lock-version = "2.0"
python-versions = ">=3.8,<3.12" python-versions = ">=3.8,<3.12"
content-hash = "fdc415f017cf372b555f177373a41c3ff1ffc2f65cc8ad68915713c93e31509e" content-hash = "5f01c4c58334b630f526cface15dbe20fdfd4d4da08a862db57a82857b22b28e"

View file

@ -49,14 +49,14 @@ piexif = "^1.1.3"
crayons = "^0.4.0" crayons = "^0.4.0"
opencv-python = "^4.6.0.66" opencv-python = "^4.6.0.66"
[tool.poetry.dev-dependencies] [tool.poetry.group.dev.dependencies]
mypy = "^0.910" mypy = "^0.910"
flake8 = "^4.0.1" flake8 = "^4.0.1"
nose2 = "^0.10.0" nose2 = "^0.10.0"
Sphinx = "^4.2.0" Sphinx = "^4.2.0"
[build-system] [build-system]
requires = ["poetry>=0.12"] requires = ["poetry>=1.3.2"]
build-backend = "poetry.masonry.api" build-backend = "poetry.masonry.api"
[tool.mypy] [tool.mypy]