From b49e08f131df150ae4dfcef6e1bc8e44b77b98e0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 20 Dec 2022 16:16:43 +0100 Subject: Merging upstream version 2.5.11. Signed-off-by: Daniel Baumann --- .pre-commit-config.yaml | 10 +++++----- identify/extensions.py | 2 ++ setup.cfg | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f8d82fb..8f3ac84 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.3.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -19,12 +19,12 @@ repos: - id: reorder-python-imports args: [--py37-plus, --add-import, 'from __future__ import annotations'] - repo: https://github.com/asottile/add-trailing-comma - rev: v2.3.0 + rev: v2.4.0 hooks: - id: add-trailing-comma args: [--py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v3.2.2 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py37-plus] @@ -33,11 +33,11 @@ repos: hooks: - id: autopep8 - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 exclude: ^identify/vendor/licenses\.py$ - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.990 + rev: v0.991 hooks: - id: mypy diff --git a/identify/extensions.py b/identify/extensions.py index e21b6ab..4eabc15 100644 --- a/identify/extensions.py +++ b/identify/extensions.py @@ -127,6 +127,7 @@ EXTENSIONS = { 'lr': {'text', 'lektor'}, 'lua': {'text', 'lua'}, 'm': {'text', 'objective-c'}, + 'make': {'text', 'makefile'}, 'manifest': {'text', 'manifest'}, 'map': {'text', 'map'}, 'markdown': {'text', 'markdown'}, @@ -267,6 +268,7 @@ EXTENSIONS = { } EXTENSIONS_NEED_BINARY_CHECK = { 'plist': {'plist'}, + 'ppm': {'image', 'ppm'}, } NAMES = { diff --git a/setup.cfg b/setup.cfg index f82ec30..af5fd6c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = identify -version = 2.5.9 +version = 2.5.11 description = File identification library for Python long_description = file: README.md long_description_content_type = text/markdown -- cgit v1.2.3