From 312f02fec0a3ca0b396031131b5757aa7e53f215 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 23 Nov 2022 09:08:45 +0100 Subject: Merging upstream version 2.5.9. Signed-off-by: Daniel Baumann --- .pre-commit-config.yaml | 10 +++++----- identify/extensions.py | 5 +++++ setup.cfg | 3 +-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 258f0e1..f8d82fb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,11 +10,11 @@ repos: - id: name-tests-test - id: requirements-txt-fixer - repo: https://github.com/asottile/setup-cfg-fmt - rev: v2.1.0 + rev: v2.2.0 hooks: - id: setup-cfg-fmt - repo: https://github.com/asottile/reorder_python_imports - rev: v3.8.5 + rev: v3.9.0 hooks: - id: reorder-python-imports args: [--py37-plus, --add-import, 'from __future__ import annotations'] @@ -24,12 +24,12 @@ repos: - id: add-trailing-comma args: [--py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v3.1.0 + rev: v3.2.2 hooks: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/pre-commit/mirrors-autopep8 - rev: v1.7.0 + rev: v2.0.0 hooks: - id: autopep8 - repo: https://github.com/PyCQA/flake8 @@ -38,6 +38,6 @@ repos: - id: flake8 exclude: ^identify/vendor/licenses\.py$ - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.982 + rev: v0.990 hooks: - id: mypy diff --git a/identify/extensions.py b/identify/extensions.py index 87c91e7..e21b6ab 100644 --- a/identify/extensions.py +++ b/identify/extensions.py @@ -51,6 +51,7 @@ EXTENSIONS = { 'eot': {'binary', 'eot'}, 'eps': {'binary', 'eps'}, 'erb': {'text', 'erb'}, + 'erl': {'text', 'erlang'}, 'exe': {'binary'}, 'eyaml': {'text', 'yaml'}, 'f03': {'text', 'fortran'}, @@ -79,6 +80,7 @@ EXTENSIONS = { 'hcl': {'text', 'hcl'}, 'hh': {'text', 'header', 'c++'}, 'hpp': {'text', 'header', 'c++'}, + 'hrl': {'text', 'erlang'}, 'hs': {'text', 'haskell'}, 'htm': {'text', 'html'}, 'html': {'text', 'html'}, @@ -333,7 +335,10 @@ NAMES = { 'pylintrc': EXTENSIONS['ini'] | {'pylintrc'}, 'README': EXTENSIONS['txt'], 'Rakefile': EXTENSIONS['rb'], + 'rebar.config': EXTENSIONS['erl'], 'setup.cfg': EXTENSIONS['ini'], + 'sys.config': EXTENSIONS['erl'], + 'sys.config.src': EXTENSIONS['erl'], 'WORKSPACE': EXTENSIONS['bzl'], 'wscript': EXTENSIONS['py'], } diff --git a/setup.cfg b/setup.cfg index ddf304d..f82ec30 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = identify -version = 2.5.8 +version = 2.5.9 description = File identification library for Python long_description = file: README.md long_description_content_type = text/markdown @@ -48,7 +48,6 @@ check_untyped_defs = true disallow_any_generics = true disallow_incomplete_defs = true disallow_untyped_defs = true -no_implicit_optional = true warn_redundant_casts = true warn_unused_ignores = true -- cgit v1.2.3