From de00e3e65120bf38f2b45b3fa18d6bec084c6286 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 5 Jan 2023 09:20:55 +0100 Subject: Merging upstream version 2.5.12. Signed-off-by: Daniel Baumann --- .github/workflows/main.yml | 13 +++++++++++++ .pre-commit-config.yaml | 2 +- README.md | 8 +++----- azure-pipelines.yml | 19 ------------------- identify/extensions.py | 1 + setup.cfg | 2 +- 6 files changed, 19 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..3c7e995 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,13 @@ +name: main + +on: + push: + branches: [main, test-me-*] + tags: + pull_request: + +jobs: + main: + uses: asottile/workflows/.github/workflows/tox.yml@v1.0.0 + with: + env: '["py38", "py39", "py310"]' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8f3ac84..b29a10d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/pre-commit/mirrors-autopep8 - rev: v2.0.0 + rev: v2.0.1 hooks: - id: autopep8 - repo: https://github.com/PyCQA/flake8 diff --git a/README.md b/README.md index 97e9f58..c98afe2 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,9 @@ +[![build status](https://github.com/pre-commit/identify/actions/workflows/main.yml/badge.svg)](https://github.com/pre-commit/identify/actions/workflows/main.yml) +[![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) + identify ======== -[![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. Given a file (or some information about a file), return a set of standardized diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index ada0df8..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,19 +0,0 @@ -trigger: - branches: - include: [main, test-me-*] - tags: - include: ['*'] - -resources: - repositories: - - repository: asottile - type: github - endpoint: github - name: asottile/azure-pipeline-templates - ref: refs/tags/v2.4.0 - -jobs: -- template: job--python-tox.yml@asottile - parameters: - toxenvs: [py37, py38] - os: linux diff --git a/identify/extensions.py b/identify/extensions.py index 4eabc15..9f4f239 100644 --- a/identify/extensions.py +++ b/identify/extensions.py @@ -168,6 +168,7 @@ EXTENSIONS = { 'properties': {'text', 'java-properties'}, 'proto': {'text', 'proto'}, 'ps1': {'text', 'powershell'}, + 'pug': {'text', 'pug'}, 'puml': {'text', 'plantuml'}, 'purs': {'text', 'purescript'}, 'pxd': {'text', 'cython'}, diff --git a/setup.cfg b/setup.cfg index af5fd6c..6a2f90c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = identify -version = 2.5.11 +version = 2.5.12 description = File identification library for Python long_description = file: README.md long_description_content_type = text/markdown -- cgit v1.2.3