From 9ad39a2df5dcb8c5dcdfb48df8d8f332f313e9ec Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 29 Dec 2021 15:39:27 +0100 Subject: Merging upstream version 2.4.1. Signed-off-by: Daniel Baumann --- .github/FUNDING.yml | 2 -- .pre-commit-config.yaml | 10 +++++----- identify/extensions.py | 1 + setup.cfg | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 9408e44..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: asottile -open_collective: pre-commit diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 10b0f4d..1ab118a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.1.0 hooks: - id: check-docstring-first - id: check-yaml @@ -11,7 +11,7 @@ repos: - id: requirements-txt-fixer - id: trailing-whitespace - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.19.0 + rev: v1.20.0 hooks: - id: setup-cfg-fmt - repo: https://github.com/PyCQA/flake8 @@ -30,16 +30,16 @@ repos: - id: reorder-python-imports args: [--py3-plus] - repo: https://github.com/asottile/add-trailing-comma - rev: v2.2.0 + rev: v2.2.1 hooks: - id: add-trailing-comma args: [--py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v2.29.0 + rev: v2.29.1 hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.910-1 + rev: v0.930 hooks: - id: mypy diff --git a/identify/extensions.py b/identify/extensions.py index de41c1a..8267bad 100644 --- a/identify/extensions.py +++ b/identify/extensions.py @@ -269,6 +269,7 @@ NAMES = { '.mention-bot': EXTENSIONS['json'] | {'mention-bot'}, '.npmignore': {'text', 'npmignore'}, '.pdbrc': EXTENSIONS['py'] | {'pdbrc'}, + '.prettierignore': {'text', 'gitignore', 'prettierignore'}, '.pypirc': EXTENSIONS['ini'] | {'pypirc'}, '.rstcheck.cfg': EXTENSIONS['ini'], '.yamllint': EXTENSIONS['yaml'] | {'yamllint'}, diff --git a/setup.cfg b/setup.cfg index 43b5aff..88eddb6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = identify -version = 2.4.0 +version = 2.4.1 description = File identification library for Python long_description = file: README.md long_description_content_type = text/markdown -- cgit v1.2.3