Merging upstream version 2.5.26.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.github/workflows/main.yml

@@ -3,11 +3,11 @@ name: main
 on:
   push:
     branches: [main, test-me-*]
-    tags:
+    tags: '*'
   pull_request:
 
 jobs:
   main:
-    uses: asottile/workflows/.github/workflows/tox.yml@v1.0.0
+    uses: asottile/workflows/.github/workflows/tox.yml@v1.5.0
     with:
-      env: '["py38", "py39", "py310"]'
+      env: '["py38", "py39", "py310", "py311"]'

.pre-commit-config.yaml

@@ -10,24 +10,23 @@ repos:
     -   id: name-tests-test
     -   id: requirements-txt-fixer
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
-    hooks:
-    -   id: setup-cfg-fmt
--   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.9.0
-    hooks:
-    -   id: reorder-python-imports
-        args: [--py37-plus, --add-import, 'from __future__ import annotations']
--   repo: https://github.com/asottile/add-trailing-comma
     rev: v2.4.0
     hooks:
+    -   id: setup-cfg-fmt
+-   repo: https://github.com/asottile/reorder-python-imports
+    rev: v3.10.0
+    hooks:
+    -   id: reorder-python-imports
+        args: [--py38-plus, --add-import, 'from __future__ import annotations']
+-   repo: https://github.com/asottile/add-trailing-comma
+    rev: v3.0.0
+    hooks:
     -   id: add-trailing-comma
-        args: [--py36-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.9.0
     hooks:
     -   id: pyupgrade
-        args: [--py37-plus]
+        args: [--py38-plus]
 -   repo: https://github.com/pre-commit/mirrors-autopep8
     rev: v2.0.2
     hooks:
@@ -38,6 +37,6 @@ repos:
     -   id: flake8
         exclude: ^identify/vendor/licenses\.py$
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.2.0
+    rev: v1.4.1
     hooks:
     -   id: mypy

identify/extensions.py

@@ -54,7 +54,9 @@ EXTENSIONS = {
     'eps': {'binary', 'eps'},
     'erb': {'text', 'erb'},
     'erl': {'text', 'erlang'},
+    'ex': {'text', 'elixir'},
     'exe': {'binary'},
+    'exs': {'text', 'elixir'},
     'eyaml': {'text', 'yaml'},
     'f03': {'text', 'fortran'},
     'f08': {'text', 'fortran'},
@@ -97,7 +99,7 @@ EXTENSIONS = {
     'inl': {'text', 'inl', 'c++'},
     'ino': {'text', 'ino', 'c++'},
     'inx': {'text', 'xml', 'inx'},
-    'ipynb': {'text', 'jupyter'},
+    'ipynb': {'text', 'jupyter', 'json'},
     'j2': {'text', 'jinja'},
     'jade': {'text', 'jade'},
     'jar': {'binary', 'zip', 'jar'},

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = identify
-version = 2.5.24
+version = 2.5.26
 description = File identification library for Python
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -8,7 +8,7 @@ url = https://github.com/pre-commit/identify
 author = Chris Kuehl
 author_email = ckuehl@ocf.berkeley.edu
 license = MIT
-license_file = LICENSE
+license_files = LICENSE
 classifiers =
     License :: OSI Approved :: MIT License
     Programming Language :: Python :: 3
@@ -18,7 +18,7 @@ classifiers =
 
 [options]
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.8
 
 [options.packages.find]
 exclude =

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,pypy3,pre-commit
+envlist = py,pre-commit
 
 [testenv]
 deps = -rrequirements-dev.txt