From 542b9d00f67b239dfe6063e76d819ca17f52d046 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 12 Feb 2025 22:00:21 +0100
Subject: [PATCH] Merging upstream version 2.5.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
---
 .pre-commit-config.yaml | 50 ++++++++++++++++++++---------------------
 README.md               |  6 ++---
 azure-pipelines.yml     |  2 +-
 identify/extensions.py  |  2 ++
 identify/py.typed       |  0
 setup.cfg               |  6 ++++-
 6 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 identify/py.typed

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fcb1cd1..1807f3c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,45 +1,43 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
-    -   id: check-docstring-first
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: debug-statements
     -   id: double-quote-string-fixer
-    -   id: end-of-file-fixer
     -   id: name-tests-test
     -   id: requirements-txt-fixer
-    -   id: trailing-whitespace
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.0
+    rev: v1.20.1
     hooks:
     -   id: setup-cfg-fmt
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.1.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.2.3
+    hooks:
+    -   id: add-trailing-comma
+        args: [--py36-plus]
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.32.1
+    hooks:
+    -   id: pyupgrade
+        args: [--py37-plus]
+-   repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v1.6.0
+    hooks:
+    -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:
     -   id: flake8
         exclude: ^identify/vendor/licenses\.py$
-        additional_dependencies: [flake8-typing-imports==1.12.0]
--   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.6.0
-    hooks:
-    -   id: autopep8
--   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.0.1
-    hooks:
-    -   id: reorder-python-imports
-        args: [--py37-plus, --add-import, 'from __future__ import annotations']
--   repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.2.1
-    hooks:
-    -   id: add-trailing-comma
-        args: [--py36-plus]
--   repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
-    hooks:
-    -   id: pyupgrade
-        args: [--py37-plus]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.940
+    rev: v0.950
     hooks:
     -   id: mypy
diff --git a/README.md b/README.md
index c209782..ccd7ad2 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 identify
 ========
 
-[![Build Status](https://dev.azure.com/asottile/asottile/_apis/build/status/pre-commit.identify?branchName=master)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=67&branchName=master)
-[![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/asottile/asottile/67/master.svg)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=67&branchName=master)
-[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/pre-commit/identify/master.svg)](https://results.pre-commit.ci/latest/github/pre-commit/identify/master)
+[![Build Status](https://dev.azure.com/asottile/asottile/_apis/build/status/pre-commit.identify?branchName=main)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=67&branchName=main)
+[![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/asottile/asottile/67/main.svg)](https://dev.azure.com/asottile/asottile/_build/latest?definitionId=67&branchName=main)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/pre-commit/identify/main.svg)](https://results.pre-commit.ci/latest/github/pre-commit/identify/main)
 [![PyPI version](https://badge.fury.io/py/identify.svg)](https://pypi.python.org/pypi/identify)
 
 File identification library for Python.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 131e765..ada0df8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,6 @@
 trigger:
   branches:
-    include: [master, test-me-*]
+    include: [main, test-me-*]
   tags:
     include: ['*']
 
diff --git a/identify/extensions.py b/identify/extensions.py
index 1b1f7fa..f5ad460 100644
--- a/identify/extensions.py
+++ b/identify/extensions.py
@@ -127,6 +127,8 @@ EXTENSIONS = {
     'mli': {'text', 'ocaml'},
     'mm': {'text', 'c++', 'objective-c++'},
     'modulemap': {'text', 'modulemap'},
+    'mscx': {'text', 'xml', 'musescore'},
+    'mscz': {'binary', 'zip', 'musescore'},
     'myst': {'text', 'myst'},
     'ngdoc': {'text', 'ngdoc'},
     'nim': {'text', 'nim'},
diff --git a/identify/py.typed b/identify/py.typed
new file mode 100644
index 0000000..e69de29
diff --git a/setup.cfg b/setup.cfg
index 57562d5..e017aaa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = identify
-version = 2.4.12
+version = 2.5.1
 description = File identification library for Python
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -37,6 +37,10 @@ console_scripts =
 license =
     ukkonen
 
+[options.package_data]
+identify =
+    py.typed
+
 [bdist_wheel]
 universal = True