cppcheck 1.1.1__tar.gz → 1.2.1__tar.gz

{cppcheck-1.1.1 → cppcheck-1.2.1}/.github/workflows/cd.yml

@@ -31,57 +31,37 @@ jobs:
           path: dist/*.tar.gz
 
   build_wheels:
-    name: Build ${{ matrix.platform }}-${{ matrix.arch }} wheels on ${{ matrix.os }}
+    name: Build ${{ matrix.build }}-${{ matrix.arch }} wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        # emulated linux: generate 6 matrix combinations with qemu on ubuntu:
-        arch: [aarch64, ppc64le, s390x]
-        platform: [manylinux, musllinux]
+        arch: [aarch64, ppc64le, s390x, x86_64, i686]
+        build: [manylinux, musllinux]
         os: [ubuntu-latest]
-        emulation: [qemu]
-        exclude:
-          # conditionally skip jobs requiring emulation:
-          - os: ubuntu-latest
-            emulation: ''
+        use_qemu: [aarch64 ppc64le s390x]
         include:
-          # linux
-          - os: ubuntu-latest
-            platform: manylinux
-            arch: x86_64
-          - os: ubuntu-latest
-            platform: manylinux
-            arch: i686
-          - os: ubuntu-latest
-            platform: musllinux
-            arch: x86_64
-          - os: ubuntu-latest
-            platform: musllinux
-            arch: i686
-          # windows
           - os: windows-2019
-            platform: win
             arch: AMD64
+            build: win
           - os: windows-2019
-            platform: win
             arch: x86
-          # macos
+            build: win
           - os: macos-13
-            platform: macos
             arch: x86_64
+            build: macos
           - os: macos-latest
-            platform: macos
             arch: arm64
+            build: macos
+          - os: ubuntu-latest
+            arch: armv7l
+            build: musllinux_
+            use_qemu: armv7l
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Support long paths on Windows
-        if: runner.os == 'Windows'
-        run: git config --system core.longpaths true
-
       - name: Set up msvc on Windows
         if: runner.os == 'Windows'
         uses: ilammy/msvc-dev-cmd@v1
@@ -90,46 +70,32 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3.2.0
-        if: runner.os == 'Linux' && matrix.emulation == 'qemu'
+        if: runner.os == 'Linux' && contains(matrix.use_qemu, matrix.arch)
 
       - name: Check architecture and set environment variable
         if: runner.os == 'Linux'
         run: |
           echo "Checking architecture..."
-          if [[ ${{ matrix.arch }} == 'aarch64' ||
-                ${{ matrix.arch }} == 'ppc64le' ||
-                ${{ matrix.arch }} == 's390x' ]]; then
-            echo "Setting CIBW_ENVIRONMENT to 1"
+          if [[ ${{ matrix.arch }} == "aarch64" ||
+                ${{ matrix.arch }} == "ppc64le" ||
+                ${{ matrix.arch }} == "s390x"   ||
+                ${{ matrix.arch }} == *"arm"* ]]; then
+            echo "Set VCPKG_FORCE_SYSTEM_BINARIES=1"
             echo "CIBW_ENVIRONMENT=VCPKG_FORCE_SYSTEM_BINARIES=1" >> $GITHUB_ENV
           fi
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20
+        uses: pypa/cibuildwheel@v2.21.3
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
-          # restrict to a single Python version as wheel does not depend on Python:
-          CIBW_BUILD: cp311-${{ matrix.platform }}*
+          CIBW_BUILD: cp311-${{ matrix.build }}*
 
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: cibw-${{ runner.os }}-${{ matrix.platform }}-${{ matrix.arch }}
+          name: cibw-${{ runner.os }}-${{ matrix.build }}-${{ matrix.arch }}
           path: wheelhouse/*.whl
 
-
-  check_dist:
-    name: Check dist
-    needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: cibw-*
-          path: dist
-          merge-multiple: true
-
-      - run: pipx run twine check --strict dist/*
-
   upload_all:
     needs: [build_wheels, build_sdist]
     environment: pypi

{cppcheck-1.1.1 → cppcheck-1.2.1}/.pre-commit-config.yaml

@@ -37,14 +37,6 @@ repos:
       - id: requirements-txt-fixer
       - id: trailing-whitespace
 
-  # Check RST
-  - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.10.0
-    hooks:
-      - id: rst-backticks
-      - id: rst-directive-colons
-      - id: rst-inline-touching-normal
-
   # Strong lint from ruff
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.14
@@ -62,6 +54,7 @@ repos:
         args: []
         additional_dependencies:
           - pytest
+          - importlib_metadata
 
   # Check yaml
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks

{cppcheck-1.1.1 → cppcheck-1.2.1}/.vscode/settings.json

@@ -4,12 +4,6 @@
   "python.testing.pytestEnabled": true,
   "cmake.useCMakePresets": "always",
   "cmake.options.statusBarVisibility": "compact",
-  "files.exclude": {
-    "**/.clangd/**": true
-  },
-  "files.watcherExclude": {
-    "**/.clangd/**": true
-  },
   "files.associations": {
     "iosfwd": "cpp",
     "type_traits": "cpp",

{cppcheck-1.1.1 → cppcheck-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cppcheck
-Version: 1.1.1
+Version: 1.2.1
 Summary: Package cppcheck as a python wheel.
 Author-Email: msclock <msclock@126.com>
 License: Apache-2.0

{cppcheck-1.1.1 → cppcheck-1.2.1}/cmake/vcpkg/ports/cppcheck/portfile.cmake

@@ -15,6 +15,13 @@ vcpkg_replace_string("${SOURCE_PATH}/cmake/compilerDefinitions.cmake"
   [[]]
 )
 
+if(VCPKG_TARGET_IS_LINUX)
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+      message(STATUS "Disable automatic elf rpath fixup for ${VCPKG_TARGET_ARCHITECTURE} linux")
+      set(VCPKG_FIXUP_ELF_RPATH OFF)
+    endif()
+endif()
+
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES

{cppcheck-1.1.1 → cppcheck-1.2.1}/src/cppcheck/__init__.py

@@ -15,15 +15,12 @@ import sys
 from pathlib import Path
 from typing import Iterable
 
+from importlib_metadata import distribution
+
 from ._version import version as __version__
 
 __all__ = ["__version__", "cppcheck"]
 
-if sys.version_info < (3, 8):
-    from importlib_metadata import distribution
-else:
-    from importlib.metadata import distribution
-
 
 @functools.lru_cache(maxsize=None)
 def _get_cppcheck() -> Path:
@@ -31,7 +28,7 @@ def _get_cppcheck() -> Path:
     assert package_files is not None, f"There must exist {__package__} files"
     for file in package_files:
         if str(file).startswith(f"{__package__}/Cppcheck"):
-            resolved_file = Path(file.locate()).resolve(strict=True)
+            resolved_file = Path(str(file.locate())).resolve(strict=True)
             cppcheck_path = resolved_file.parents[1]
             if cppcheck_path.exists():
                 return cppcheck_path

{cppcheck-1.1.1 → cppcheck-1.2.1}/src/cppcheck/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.1'
-__version_tuple__ = version_tuple = (1, 1, 1)
+__version__ = version = '1.2.1'
+__version_tuple__ = version_tuple = (1, 2, 1)

cppcheck-1.2.1/tests/test_package.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+import subprocess
+
+import pytest
+from importlib_metadata import version
+
+import cppcheck as m
+
+
+def test_version():
+    assert version("cppcheck") == m.__version__
+
+
+@pytest.mark.parametrize("testcase", [("--version", f"{m.__version__}")])
+def test_cppcheck(testcase):
+    test_input, test_output = testcase
+    output = subprocess.run(["cppcheck", test_input], capture_output=True, check=True)
+    assert test_output in str(output.stdout.rstrip())

cppcheck-1.1.1/tests/test_package.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-import sys
-
-if sys.version_info < (3, 8):
-    from importlib_metadata import version
-else:
-    from importlib.metadata import version
-
-import cppcheck as m
-
-
-def test_version():
-    assert version("cppcheck") == m.__version__