Skip to content

Commit 5ce316e

Browse files
authored
Merge branch 'main' into shenxianpeng-patch-1
2 parents 8d74305 + 1de5271 commit 5ce316e

9 files changed

+15
-15
lines changed

.github/workflows/python-test.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ on:
99
pull_request:
1010
branches: [ "main" ]
1111
paths:
12-
- "**.py"
12+
- "clang_tools/*"
13+
- "tests/*"
1314
- "**requirements*.txt"
1415
- pyproject.toml
1516
- .pre-commit-config.yaml
@@ -76,11 +77,8 @@ jobs:
7677
needs: [build]
7778
strategy:
7879
matrix:
79-
version: [ 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17, 18, 19 ]
80-
os: [ ubuntu-latest, macos-latest, windows-latest ]
81-
exclude:
82-
- version: 19
83-
os: macos-latest # FIXME: https://github.com/cpp-linter/clang-tools-static-binaries/issues/40
80+
version: [ 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17, 18, 19, 20 ]
81+
os: [ ubuntu-latest, macos-13, windows-latest ]
8482
fail-fast: false
8583
runs-on: ${{ matrix.os }}
8684
steps:

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v5.0.0
44
hooks:
55
- id: trailing-whitespace
66
exclude: \.output
@@ -12,11 +12,11 @@ repos:
1212
- id: debug-statements
1313
- id: requirements-txt-fixer
1414
- repo: https://github.com/asottile/pyupgrade
15-
rev: v3.15.1
15+
rev: v3.20.0
1616
hooks:
1717
- id: pyupgrade
1818
- repo: https://github.com/astral-sh/ruff-pre-commit
19-
rev: v0.2.2
19+
rev: v0.11.11
2020
hooks:
2121
- id: ruff
2222
- id: ruff-format

README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,4 @@ clang-format, clang-tidy, clang-query, clang-apply-replacements
139139
Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
140140
macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
141141

142-
.. warning::
143-
All clang-tidy v14+ builds for MacOS are still ~1.6 GB in size.
142+
For more details, visit the `clang-tools-static-binaries <https://github.com/cpp-linter/clang-tools-static-binaries>`_ repository.

clang_tools/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""The clang-tools package's base module."""
2+
23
from .util import check_install_os
34

45

@@ -8,4 +9,4 @@
89
suffix = ".exe" if install_os == "windows" else ""
910

1011
# tag of https://github.com/cpp-linter/clang-tools-static-binaries/releases
11-
release_tag = "master-4eaa4a54"
12+
release_tag = "master-b35c5633"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d916477bdedd48245b6eedeb8680fcb0665a0145c7b078ddc4ba3f1fbc16eb6b081dc89f41242f228b723a472eb734836d1914178abdd94293a25a9e62eefc11 clang-format-12_linux-amd64
1+
79afa99481f071bee2be3e72d2b1641b60427cc202360e44cf4e5dc6f977c4e4223e5a29430a15c9c80720dd6f75801f4811d2848ee52fe014fc232a99a589af clang-format-12_linux-amd64
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2bf05024600216eef6da1884e35fc7a0b8a559dcff59d960c255034253727e2b24bc2b4310d6adb340b0afaea18fdf9a25fa303597b094316da95a07e5956c17 clang-format-12_macosx-amd64
1+
9be1e20c5b418e6100fb39f45ea43a0a653cb8457abd942d167187d4493028fbd0993cbf6fc574bc4158d1ec76a076c617596cc6c2a6a0135e51d0e0617a7655 clang-format-12_macosx-amd64
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e6af28b649411d9bd53b6a2dac85f1b99a20a6667c83cf0b10f78ec67027c89a720b8f7262c4b48315f4fc53b87099a5d0b9ef87adee94173976e5284b5f9adb *clang-format-12_windows-amd64
1+
7c00dc5d2f715ee7f022121335f10896f092bbb8bd91c304010241fb11926b459a6995b2d79fc2171f7523b748455c53d009d69f88c81da0841ca57114fbbdce *clang-format-12_windows-amd64

tests/test_install.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Tests related to installing a clang tool."""
2+
23
from pathlib import PurePath, Path
34
import os
45
import pytest

tests/test_main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Tests that relate to the main.py module."""
2+
23
from typing import Optional, List
34
from argparse import ArgumentParser
45
import pytest

0 commit comments

Comments
 (0)