From 545be95911a823a5422121415625e962d4e92210 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 3 Nov 2021 09:06:55 +0100 Subject: Merging upstream version 2.3.3. Signed-off-by: Daniel Baumann --- .pre-commit-config.yaml | 10 +++++----- bin/vendor-licenses | 2 +- identify/cli.py | 2 +- identify/extensions.py | 2 ++ identify/interpreters.py | 1 + setup.cfg | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f87a3c..f5881ae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,11 +11,11 @@ repos: - id: requirements-txt-fixer - id: trailing-whitespace - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.17.0 + rev: v1.18.0 hooks: - id: setup-cfg-fmt - repo: https://github.com/PyCQA/flake8 - rev: 3.9.2 + rev: 4.0.1 hooks: - id: flake8 exclude: ^identify/vendor/licenses\.py$ @@ -30,16 +30,16 @@ repos: - id: reorder-python-imports args: [--py3-plus] - repo: https://github.com/asottile/add-trailing-comma - rev: v2.1.0 + rev: v2.2.0 hooks: - id: add-trailing-comma args: [--py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v2.28.0 + rev: v2.29.0 hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.910 + rev: v0.910-1 hooks: - id: mypy diff --git a/bin/vendor-licenses b/bin/vendor-licenses index 1303558..9bbce91 100755 --- a/bin/vendor-licenses +++ b/bin/vendor-licenses @@ -54,4 +54,4 @@ def main() -> int: if __name__ == '__main__': - exit(main()) + raise SystemExit(main()) diff --git a/identify/cli.py b/identify/cli.py index 28e6155..c61ebe4 100644 --- a/identify/cli.py +++ b/identify/cli.py @@ -31,4 +31,4 @@ def main(argv: Optional[Sequence[str]] = None) -> int: if __name__ == '__main__': - exit(main()) + raise SystemExit(main()) diff --git a/identify/extensions.py b/identify/extensions.py index 67d601a..17f86a7 100644 --- a/identify/extensions.py +++ b/identify/extensions.py @@ -137,6 +137,7 @@ EXTENSIONS = { 'png': {'binary', 'image', 'png'}, 'po': {'text', 'pofile'}, 'pp': {'text', 'puppet'}, + 'prisma': {'text', 'prisma'}, 'properties': {'text', 'java-properties'}, 'proto': {'text', 'proto'}, 'ps1': {'text', 'powershell'}, @@ -172,6 +173,7 @@ EXTENSIONS = { 'ss': {'text', 'scheme'}, 'styl': {'text', 'stylus'}, 'sv': {'text', 'system-verilog'}, + 'svelte': {'text', 'svelte'}, 'svg': {'text', 'image', 'svg', 'xml'}, 'svh': {'text', 'system-verilog'}, 'swf': {'binary', 'swf'}, diff --git a/identify/interpreters.py b/identify/interpreters.py index dabf36c..fde9e25 100644 --- a/identify/interpreters.py +++ b/identify/interpreters.py @@ -3,6 +3,7 @@ INTERPRETERS = { 'awk': {'awk'}, 'bash': {'shell', 'bash'}, 'bats': {'shell', 'bash', 'bats'}, + 'cbsd': {'shell', 'cbsd'}, 'csh': {'shell', 'csh'}, 'dash': {'shell', 'dash'}, 'expect': {'expect'}, diff --git a/setup.cfg b/setup.cfg index 48ea6f5..dfd0811 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = identify -version = 2.3.0 +version = 2.3.3 description = File identification library for Python long_description = file: README.md long_description_content_type = text/markdown @@ -17,6 +17,7 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy -- cgit v1.2.3