From 02662d8064822ac96da8161fba38272359b93fa6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 14 Jan 2022 15:38:45 +0100 Subject: Merging upstream version 2.4.4. Signed-off-by: Daniel Baumann --- .pre-commit-config.yaml | 6 +++--- identify/extensions.py | 3 +++ setup.cfg | 2 +- tox.ini | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1ab118a..11d1fd8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: exclude: ^identify/vendor/licenses\.py$ additional_dependencies: [flake8-typing-imports==1.10.1] - repo: https://github.com/pre-commit/mirrors-autopep8 - rev: v1.5.7 + rev: v1.6.0 hooks: - id: autopep8 - repo: https://github.com/asottile/reorder_python_imports @@ -35,11 +35,11 @@ repos: - id: add-trailing-comma args: [--py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v2.29.1 + rev: v2.31.0 hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.930 + rev: v0.931 hooks: - id: mypy diff --git a/identify/extensions.py b/identify/extensions.py index 8267bad..508eb9a 100644 --- a/identify/extensions.py +++ b/identify/extensions.py @@ -25,6 +25,7 @@ EXTENSIONS = { 'coffee': {'text', 'coffee'}, 'conf': {'text'}, 'cpp': {'text', 'c++'}, + 'cr': {'text', 'crystal'}, 'crt': {'text', 'pem'}, 'cs': {'text', 'c#'}, 'csproj': {'text', 'xml', 'csproj'}, @@ -78,6 +79,7 @@ EXTENSIONS = { 'idr': {'text', 'idris'}, 'inc': {'text', 'inc'}, 'ini': {'text', 'ini'}, + 'ino': {'text', 'ino', 'c++'}, 'inx': {'text', 'xml', 'inx'}, 'ipynb': {'text', 'jupyter'}, 'j2': {'text', 'jinja'}, @@ -113,6 +115,7 @@ EXTENSIONS = { 'md': {'text', 'markdown'}, 'mdx': {'text', 'mdx'}, 'mib': {'text', 'mib'}, + 'mjs': {'text', 'javascript'}, 'mk': {'text', 'makefile'}, 'ml': {'text', 'ocaml'}, 'mli': {'text', 'ocaml'}, diff --git a/setup.cfg b/setup.cfg index 88eddb6..99d565e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = identify -version = 2.4.1 +version = 2.4.4 description = File identification library for Python long_description = file: README.md long_description_content_type = text/markdown diff --git a/tox.ini b/tox.ini index a063c94..c88822d 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ extras = license commands = coverage erase coverage run -m pytest {posargs:tests} - coverage report --fail-under 100 + coverage report [testenv:pre-commit] skip_install = true -- cgit v1.2.3