Skip to content

Commit ce4717b

Browse files
msclock-bot[bot]msclock
msclock-bot[bot]
and
msclock
authored
chore(deps): update dependency https://github.com/serious-scaffold/ss-pybind11 to v0.8.24 (#112)
* chore(deps): update dependency https://github.com/serious-scaffold/ss-pybind11 to v0.8.24 * Resolve conflicts Signed-off-by: l.feng <[email protected]> * Constraint to 3.9 Signed-off-by: l.feng <[email protected]> --------- Signed-off-by: l.feng <[email protected]> Co-authored-by: msclock-bot[bot] <163820484+msclock-bot[bot]@users.noreply.github.com> Co-authored-by: l.feng <[email protected]>
1 parent 0c9dc7f commit ce4717b

File tree

10 files changed

+113
-75
lines changed

10 files changed

+113
-75
lines changed

‎.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v0.8.20
2+
_commit: v0.8.24
33
_src_path: https://github.com/serious-scaffold/ss-pybind11
44
author_email: [email protected]
55
author_name: l.feng

‎.github/workflows/cd.yml‎

Lines changed: 22 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: CD
22

33
on:
44
workflow_dispatch:
5+
schedule:
6+
- cron: 0 0 * * 5
57
release:
68
types:
79
- published
@@ -30,63 +32,34 @@ jobs:
3032
name: cibw-sdist
3133
path: dist/*.tar.gz
3234

35+
3336
build_wheels:
34-
name: Build ${{ matrix.build }}-${{ matrix.arch }} wheels on ${{ matrix.os }}
35-
runs-on: ${{ matrix.os }}
37+
uses: ./.github/workflows/reuseable_cibuildwheel.yml
38+
secrets: inherit
39+
with:
40+
auto: true
41+
extra: true
3642

37-
strategy:
38-
matrix:
39-
arch: [aarch64, ppc64le, s390x, armv7l, x86_64, i686]
40-
build: [manylinux, musllinux]
41-
os: [ubuntu-24.04] # renovate: github-runner
42-
use_qemu: [aarch64 ppc64le s390x armv7l]
43-
include:
44-
- os: windows-2019
45-
arch: AMD64
46-
build: win
47-
- os: windows-2019
48-
arch: x86
49-
build: win
50-
- os: windows-2022
51-
arch: ARM64
52-
build: win
53-
- os: macos-13
54-
arch: x86_64
55-
build: macos
56-
- os: macos-latest
57-
arch: arm64
58-
build: macos
5943

44+
check_dist:
45+
name: Check dist
46+
needs: [build_wheels, build_sdist]
47+
runs-on: ubuntu-24.04
6048
steps:
61-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
62-
with:
63-
fetch-depth: 0
64-
65-
- name: Set up msvc on Windows
66-
if: runner.os == 'Windows'
67-
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1
49+
- uses: actions/download-artifact@v4
6850
with:
69-
arch: ${{ matrix.arch }}
51+
pattern: cibw-*
52+
path: dist
53+
merge-multiple: true
7054

71-
- name: Set up QEMU
72-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
73-
if: runner.os == 'Linux' && contains(matrix.use_qemu, matrix.arch)
55+
- run: pipx run twine check --strict dist/*
7456

75-
- name: Build wheels
76-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
77-
env:
78-
CIBW_ARCHS: ${{ matrix.arch }}
79-
CIBW_BUILD: cp311-${{ matrix.build }}*
80-
81-
- name: Upload wheels
82-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
83-
with:
84-
name: cibw-${{ runner.os }}-${{ matrix.build }}-${{ matrix.arch }}
85-
path: wheelhouse/*.whl
8657

8758
upload_all:
88-
needs: [build_wheels, build_sdist]
89-
environment: pypi
59+
needs: [build_wheels, build_sdist, check_dist]
60+
environment:
61+
name: pypi
62+
url: https://pypi.org/project/cppcheck-wheel
9063
permissions:
9164
id-token: write
9265
runs-on: ubuntu-24.04
@@ -101,6 +74,6 @@ jobs:
10174

10275
- uses: pypa/gh-action-pypi-publish@release/v1
10376
env:
104-
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
77+
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
10578
with:
10679
password: ${{ secrets.PYPI_API_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,18 @@ jobs:
4141
pipx run nox -s pylint
4242
4343
44-
45-
checks:
46-
runs-on: ${{ matrix.runs-on }}
44+
wheels:
4745
needs: [pre-commit]
48-
strategy:
49-
fail-fast: false
50-
matrix:
51-
python-version: ['3.8', '3.12']
52-
runs-on: [ubuntu-24.04, macos-14, windows-2022] # renovate: github-runner
46+
uses: ./.github/workflows/reuseable_cibuildwheel.yml
47+
secrets: inherit
48+
with:
49+
auto: true
50+
extra: false
5351

54-
name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }}
52+
53+
codecov:
54+
runs-on: ubuntu-24.04
55+
needs: [pre-commit]
5556

5657
steps:
5758
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -65,13 +66,12 @@ jobs:
6566
~/vcpkg
6667
~/.cache/pip
6768
~/.cache/vcpkg
68-
~/AppData/Local/vcpkg
69-
key: ${{ matrix.python-version }}-${{ matrix.runs-on }}-${{ hashFiles('vcpkg.json') }}
70-
restore-keys: ${{ matrix.python-version }}-${{ matrix.runs-on }}-${{ hashFiles('vcpkg.json') }}
69+
key: codecov-${{ hashFiles('vcpkg.json') }}
70+
restore-keys: codecov-${{ hashFiles('vcpkg.json') }}
7171

7272
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
7373
with:
74-
python-version: ${{ matrix.python-version }}
74+
python-version: 3.x
7575

7676
- name: Install package
7777
run: python -m pip install .[test] -v
@@ -88,7 +88,6 @@ jobs:
8888
check-docs:
8989
runs-on: ubuntu-24.04
9090
needs: [pre-commit]
91-
timeout-minutes: 15
9291

9392
steps:
9493
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -119,7 +118,8 @@ jobs:
119118
pass:
120119
if: always()
121120
needs:
122-
- checks
121+
- wheels
122+
- codecov
123123
- check-docs
124124
runs-on: ubuntu-24.04
125125
timeout-minutes: 2

‎.github/workflows/codeql.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
analyze:
3232
name: Analyze
3333
runs-on: ubuntu-24.04
34-
timeout-minutes: 15
3534
permissions:
3635
actions: read
3736
contents: read

‎.github/workflows/pages.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
permissions:
2929
contents: write
3030
id-token: write
31-
timeout-minutes: 15
3231

3332
steps:
3433
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

‎.github/workflows/reuseable_cibuildwheel.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: cibuildwheel
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
auto:
7+
description: Build wheels for auto archs
8+
required: true
9+
type: boolean
10+
extra:
11+
description: Build wheels for aarch64 armv7l ppc64le & s390x
12+
required: true
13+
type: boolean
14+
15+
jobs:
16+
build_wheels:
17+
name: On ${{ matrix.os }}, with ${{ matrix.arch }}, build ${{ matrix.build }} wheels
18+
runs-on: ${{ matrix.os }}
19+
20+
strategy:
21+
matrix:
22+
os: [ubuntu-24.04] # renovate: github-runner
23+
arch: [aarch64, ppc64le, s390x, armv7l, x86_64, i686]
24+
build: [manylinux, musllinux]
25+
qemu_arch: [aarch64 ppc64le s390x armv7l]
26+
include:
27+
- {os: windows-2019, arch: AMD64, build: win}
28+
- {os: windows-2019, arch: x86, build: win}
29+
- {os: windows-2022, arch: ARM64, build: win}
30+
- {os: macos-13, arch: x86_64, build: macos}
31+
- {os: macos-14, arch: arm64, build: macos}
32+
33+
steps:
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
35+
if: >
36+
inputs.auto && !contains(matrix.qemu_arch, matrix.arch) ||
37+
inputs.extra && contains(matrix.qemu_arch, matrix.arch)
38+
with:
39+
fetch-depth: 0
40+
41+
- name: Set up msvc on Windows
42+
if: runner.os == 'Windows' && inputs.auto && !contains(matrix.qemu_arch, matrix.arch)
43+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1
44+
with:
45+
arch: ${{ matrix.arch }}
46+
47+
- name: Set up QEMU
48+
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
49+
if: runner.os == 'Linux' && inputs.extra && contains(matrix.qemu_arch, matrix.arch)
50+
51+
- name: Build wheels
52+
if: >
53+
inputs.auto && !contains(matrix.qemu_arch, matrix.arch) ||
54+
inputs.extra && contains(matrix.qemu_arch, matrix.arch)
55+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
56+
env:
57+
CIBW_ARCHS: ${{ matrix.arch }}
58+
CIBW_BUILD: cp39-${{ matrix.build }}*
59+
60+
- name: Upload wheels
61+
if: >
62+
inputs.auto && !contains(matrix.qemu_arch, matrix.arch) ||
63+
inputs.extra && contains(matrix.qemu_arch, matrix.arch)
64+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
65+
with:
66+
name: cibw-${{ matrix.os }}-${{ matrix.build }}-${{ matrix.arch }}
67+
path: wheelhouse/*.whl

‎.renovaterc.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
"datasourceTemplate": "pypi",
6262
"fileMatch": [
6363
"^\\.github/workflows/.+\\.yml$",
64-
"^\\.renovaterc\\.json$",
65-
"^Makefile$"
64+
"^\\.renovaterc\\.json$"
6665
],
6766
"matchStrings": [
6867
"pipx? install.* (?<depName>.*?)==(?<currentValue>.*?)[\\s\";]"
@@ -74,8 +73,7 @@
7473
"depTypeTemplate": "github-runner",
7574
"description": "Match GitHub runner defined in GitHub Actions matrix strategy",
7675
"fileMatch": [
77-
"^\\.github/workflows/.+\\.yml$",
78-
"^template/.*\\.github.*/workflows/.+\\.yml(\\.jinja)?$"
76+
"^\\.github/workflows/.+\\.yml$"
7977
],
8078
"matchStringsStrategy": "recursive",
8179
"matchStrings": [

‎pyproject.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
6464
sdist.include = ["src/cppcheck/_version.py"]
6565
cmake.args = [
6666
"-DBUILD_TESTING=OFF",
67-
"-DCMAKE_BUILD_TYPE=ReWithDebInfo",
67+
"-DCMAKE_BUILD_TYPE=Release",
68+
"-DVCPKG_INSTALL_REPORT_FAILURE=ON",
69+
"-DVCPKG_INSTALL_OPTIONS=--allow-unsupported",
6870
"-DCMAKE_TOOLCHAIN_FILE=cmake/vcpkg/vcpkg.toolchain.cmake",
6971
"-DVCPKG_OVERLAY_TRIPLETS=cmake/vcpkg/triplets",
7072
"-DVCPKG_OVERLAY_PORTS=cmake/vcpkg/ports",

‎tests/test_package.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_version():
1515

1616
def test_cppcheck_dir():
1717
output = subprocess.run(
18-
[m.get_cppcheck_dir() / "cppcheck", "--version"],
18+
[str(m.get_cppcheck_dir() / "cppcheck"), "--version"],
1919
capture_output=True,
2020
text=True,
2121
check=False,

‎vcpkg.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
},
2121
{
2222
"name": "cmake-modules",
23-
"version": "1.6.8"
23+
"version": "1.6.11"
2424
}
2525
],
2626
"vcpkg-configuration": {
2727
"registries": [
2828
{
2929
"kind": "git",
30-
"baseline": "a1d862fc6df3883df4516ccdd0c204d14cf4dc64",
30+
"baseline": "09ae1472980f5e2132654900bb48061444b1cea5",
3131
"repository": "https://github.com/msclock/cmake-registry",
3232
"packages": [
3333
"cmake-modules",

0 commit comments

Comments
 (0)