cppcheck-py 2.21.0__tar.gz → 2.22.0__tar.gz

{cppcheck_py-2.21.0 → cppcheck_py-2.22.0}/.gitignore

@@ -180,3 +180,5 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+
+third_party/

cppcheck_py-2.22.0/.pre-commit-config.yaml

@@ -0,0 +1,42 @@
+ci:
+  autoupdate_commit_msg: "chore(deps): update pre-commit hooks"
+  autofix_commit_msg: "style: pre-commit fixes"
+  autoupdate_schedule: "monthly"
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v6.0.0
+  hooks:
+  - id: check-added-large-files
+  - id: check-case-conflict
+  - id: check-merge-conflict
+  - id: check-symlinks
+  - id: check-yaml
+  - id: check-toml
+  - id: debug-statements
+  - id: end-of-file-fixer
+  - id: mixed-line-ending
+  - id: trailing-whitespace
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.16.6
+  hooks:
+  - id: ruff-check
+    args: [--fix, --show-fixes]
+  # Run the formatter.
+  - id: ruff-format
+
+- repo: https://github.com/BlankSpruce/gersemi-pre-commit
+  rev: 0.28.1
+  hooks:
+  - id: gersemi
+- repo: https://github.com/adhtruong/mirrors-typos
+  rev: v1.50.1
+  hooks:
+    - id: typos
+- repo: https://github.com/abravalheri/validate-pyproject
+  rev: "0.26"
+  hooks:
+    - id: validate-pyproject
+      # Optional extra validations from SchemaStore:
+      additional_dependencies: ["validate-pyproject-schema-store[all]"]

cppcheck_py-2.22.0/CMakeLists.txt

@@ -0,0 +1,103 @@
+cmake_minimum_required(VERSION 3.28...4.0)
+project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION})
+
+message(STATUS "cppcheck-wheel version: ${SKBUILD_PROJECT_VERSION}")
+string(
+    REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)"
+    CPPCHECK_VERSION
+    "${SKBUILD_PROJECT_VERSION}"
+)
+message(STATUS "cppcheck version: ${CPPCHECK_VERSION}")
+
+# Check if the current compiler/linker toolchain supports IPO
+include(CheckIPOSupported)
+check_ipo_supported(RESULT ipo_supported OUTPUT ipo_error)
+
+if(ipo_supported)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    message(STATUS "IPO/LTO enabled")
+else()
+    message(WARNING "IPO/LTO not supported: ${ipo_error}")
+endif()
+
+# Check for the execinfo header, needed for backtraces support.
+include(CheckIncludeFileCXX)
+check_include_file_cxx("execinfo.h" HAVE_EXECINFO_H)
+
+# Values cppcheck's own CMakeLists.txt will pick up as already-set variables
+# (equivalent to the old -DFOO=... CMAKE_ARGS passed to the nested build).
+if(NOT HAVE_EXECINFO_H)
+    message(STATUS "execinfo.h not found, disabling backtrace support")
+    set(NO_UNIX_BACKTRACE_SUPPORT ON)
+endif()
+
+set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+set(DISABLE_DMAKE ON)
+set(FILESDIR "" CACHE STRING "" FORCE)
+
+set(CPPCHECK_ARCHIVE
+    "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cppcheck-${CPPCHECK_VERSION}.tar.gz"
+)
+if(NOT EXISTS "${CPPCHECK_ARCHIVE}")
+    message(
+        FATAL_ERROR
+        "${CPPCHECK_ARCHIVE} not found; run scripts/vendor_cppcheck.py "
+        "(the PEP 517 backend wrapper normally does this for you)"
+    )
+endif()
+
+include(FetchContent)
+FetchContent_Declare(cppcheck URL "${CPPCHECK_ARCHIVE}" EXCLUDE_FROM_ALL)
+FetchContent_MakeAvailable(cppcheck)
+
+# Force the cppcheck target to build even though its subdirectory is
+# EXCLUDE_FROM_ALL (mirrors the old build-cppcheck ExternalProject step).
+add_custom_target(build-cppcheck ALL DEPENDS cppcheck)
+
+# Reduce the size of the executable by executing strip if it is present on the system
+find_program(STRIP_EXECUTABLE strip)
+if(STRIP_EXECUTABLE)
+    add_custom_target(
+        strip-cppcheck
+        ALL
+        COMMAND ${STRIP_EXECUTABLE} $<TARGET_FILE:cppcheck>
+        COMMENT "Stripping cppcheck executable for size reduction"
+    )
+    add_dependencies(strip-cppcheck build-cppcheck)
+endif()
+
+# Define an installation rule that copies the executable to our Python package
+install(
+    PROGRAMS
+        $<TARGET_FILE:cppcheck>
+        ${cppcheck_SOURCE_DIR}/htmlreport/cppcheck-htmlreport
+    DESTINATION cppcheck/data
+)
+
+install(
+    DIRECTORY ${cppcheck_SOURCE_DIR}/addons
+    DESTINATION cppcheck/data
+    FILES_MATCHING
+    PATTERN "*.py"
+    PATTERN "test" EXCLUDE
+)
+
+install(
+    DIRECTORY ${cppcheck_SOURCE_DIR}/cfg
+    DESTINATION cppcheck/data
+    FILES_MATCHING
+    PATTERN "*.cfg"
+)
+
+install(
+    DIRECTORY ${cppcheck_SOURCE_DIR}/platforms
+    DESTINATION cppcheck/data
+    FILES_MATCHING
+    PATTERN "*.xml"
+)
+
+install(
+    FILES ${cppcheck_SOURCE_DIR}/COPYING
+    DESTINATION cppcheck
+    RENAME COPYING-cppcheck
+)

{cppcheck_py-2.21.0 → cppcheck_py-2.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cppcheck-py
-Version: 2.21.0
+Version: 2.22.0
 Summary: Static analysis of C/C++ code
 License: Apache 2.0
 Classifier: Programming Language :: C
@@ -13,6 +13,7 @@ Project-URL: Homepage, https://cppcheck.sourceforge.io/
 Project-URL: Documentation, https://cppcheck.sourceforge.io/manual.pdf
 Project-URL: Download, https://github.com/cppcheck-opensource/cppcheck/releases
 Project-URL: Source, https://github.com/cconverse711/cppcheck-wheel
+Requires-Python: >=3.9
 Requires-Dist: pygments
 Description-Content-Type: text/markdown
 
@@ -28,11 +29,13 @@ python -m pip install cppcheck-py
 
 The tools provided are:
 
-cppcheck: performs static analysis of C/C++ source code
-cppcheck-htmlreport: generates an html report of a XML file produced by cppcheck
+* `cppcheck`: performs static analysis of C/C++ source code
+* `cppcheck-htmlreport`: generates an html report of a XML file produced by `cppcheck`
 
 This projects intends to release a new PyPI package for each major and minor release of `cppcheck`.
 
+Note that these tools are GPL-3.0 licensed; source is provided in the accompanying sdist.
+
 ## Use with pipx
 
 You can use `pipx` to run cppcheck, as well. For example, `pipx run cppcheck <args>` will run cppcheck without any previous install required on any machine with pipx (including all default GitHub Actions / Azure runners, avoiding requiring a pre-install step or even `actions/setup-python`).

{cppcheck_py-2.21.0 → cppcheck_py-2.22.0}/README.md

@@ -10,11 +10,13 @@ python -m pip install cppcheck-py
 
 The tools provided are:
 
-cppcheck: performs static analysis of C/C++ source code
-cppcheck-htmlreport: generates an html report of a XML file produced by cppcheck
+* `cppcheck`: performs static analysis of C/C++ source code
+* `cppcheck-htmlreport`: generates an html report of a XML file produced by `cppcheck`
 
 This projects intends to release a new PyPI package for each major and minor release of `cppcheck`.
 
+Note that these tools are GPL-3.0 licensed; source is provided in the accompanying sdist.
+
 ## Use with pipx
 
 You can use `pipx` to run cppcheck, as well. For example, `pipx run cppcheck <args>` will run cppcheck without any previous install required on any machine with pipx (including all default GitHub Actions / Azure runners, avoiding requiring a pre-install step or even `actions/setup-python`).

cppcheck_py-2.22.0/backend_wrapper.py

@@ -0,0 +1,49 @@
+"""Thin PEP 517 backend wrapper around scikit-build-core.
+
+Ensures cppcheck's source is vendored into third_party/ before the
+sdist is actually assembled, so `python -m build --sdist` (and anything
+that calls this hook -- pip, cibuildwheel, twine, CI) always produces a
+self-contained sdist without a manual pre-step.
+"""
+
+import subprocess
+import sys
+from pathlib import Path
+
+from scikit_build_core.build import build_editable as _build_editable
+from scikit_build_core.build import build_sdist as _build_sdist
+from scikit_build_core.build import build_wheel as _build_wheel
+
+# Re-export everything scikit-build-core provides; we only override
+# build_sdist. Anything not overridden here still needs to exist as an
+# attribute for setuptools/pip's PEP 517 hook lookup to find it.
+from scikit_build_core.build import (  # noqa: F401
+    get_requires_for_build_editable,
+    get_requires_for_build_sdist,
+    get_requires_for_build_wheel,
+    prepare_metadata_for_build_editable,
+    prepare_metadata_for_build_wheel,
+)
+
+_ROOT = Path(__file__).resolve().parent
+
+
+def _vendor_cppcheck():
+    vendor_script = _ROOT / "scripts" / "vendor_cppcheck.py"
+    print(f"[backend_wrapper] running {vendor_script}", file=sys.stderr)
+    subprocess.check_call([sys.executable, str(vendor_script)])
+
+
+def build_editable(editable_directory, config_settings=None, metadata_directory=None):
+    _vendor_cppcheck()
+    return _build_editable(editable_directory, config_settings, metadata_directory)
+
+
+def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
+    _vendor_cppcheck()
+    return _build_wheel(wheel_directory, config_settings, metadata_directory)
+
+
+def build_sdist(sdist_directory, config_settings=None):
+    _vendor_cppcheck()
+    return _build_sdist(sdist_directory, config_settings)

{cppcheck_py-2.21.0 → cppcheck_py-2.22.0}/cppcheck/__init__.py

@@ -1,41 +1,31 @@
+import functools
+import os
 import subprocess
 import sys
+from importlib.resources import files
 from pathlib import Path
-import functools
-import os
 
-if sys.version_info.minor >= 9:
-    # Only available on 3.9 or later, and required on 3.12
-    from importlib.resources import files
-else:
-    import pkg_resources
 
-def get_executable(name:str) -> Path:
+def get_executable(name: str) -> Path:
     return _get_executable(name)
 
 
-@functools.lru_cache(maxsize=None)
-def _get_executable(name:str) -> Path:
-    if sys.version_info.minor >= 9:
-        # Only available in 3.9 or later, and required in 3.12
-        possibles = [
-            Path(files("cppcheck") / f"data/{name}{s}")
-            for s in ("", ".exe", ".bin", ".dmg")
-        ]
-    else:
-        possibles = [
-            Path(pkg_resources.resource_filename("cppcheck", f"data/{name}{s}"))
-            for s in ("", ".exe", ".bin", ".dmg")
-        ]
+@functools.cache
+def _get_executable(name: str) -> Path:
+    possibles = [
+        Path(files("cppcheck") / f"data/{name}{s}")
+        for s in ("", ".exe", ".bin", ".dmg")
+    ]
     for exe in possibles:
         if exe.exists():
             if os.environ.get("CPPCHECK_WHEEL_VERBOSE", None):
-                print(f'Found binary: {exe} ')
+                print(f"Found binary: {exe}")
             return exe
 
     possibles_str = "\n\t".join(map(str, possibles))
     raise FileNotFoundError(f"No executable found for {name} at\n\t{possibles_str}")
 
+
 def _run(name, *args):
     command = [_get_executable(name)]
     if args:
@@ -44,6 +34,7 @@ def _run(name, *args):
         command += sys.argv[1:]
     return subprocess.call(command)
 
+
 def _run_python(name, *args):
     command = [sys.executable, _get_executable(name)]
     if args:
@@ -55,8 +46,10 @@ def _run_python(name, *args):
     # we have to call the interpreter and pass the script as parameter
     return subprocess.call(command)
 
+
 def cppcheck():
     raise SystemExit(_run("cppcheck"))
 
+
 def cppcheck_htmlreport():
     raise SystemExit(_run_python("cppcheck-htmlreport"))

cppcheck_py-2.22.0/cppcheck_version.txt

@@ -0,0 +1 @@
+2.22.0.0

{cppcheck_py-2.21.0 → cppcheck_py-2.22.0}/pyproject.toml

@@ -1,6 +1,9 @@
 [build-system]
-requires = ["scikit-build-core"]
-build-backend = "scikit_build_core.build"
+requires = [
+    "scikit-build-core",
+    "tomli>=2.0; python_version < '3.11'",]
+build-backend = "backend_wrapper"
+backend-path = ["."]
 
 [project]
 name = "cppcheck-py"
@@ -8,6 +11,7 @@ dynamic = ["version"]
 license = { text = "Apache 2.0" }
 description = "Static analysis of C/C++ code"
 readme = "README.md"
+requires-python = ">=3.9"
 dependencies = ["pygments"]
 classifiers = [
     "Programming Language :: C",
@@ -36,11 +40,12 @@ Source = "https://github.com/cconverse711/cppcheck-wheel"
 
 [tool.scikit-build]
 wheel.packages = ["cppcheck"]
-wheel.py-api = "py2.py3"
-cmake.version = ">=3.16.0"
+wheel.py-api = "py3"
+cmake.version = ">=3.28.0"
 ninja.version = ">=1.10.0"
 build.verbose = true
 logging.level = "DEBUG"
+sdist.include =  ["third_party/cppcheck-*.tar.gz"]
 
 [dependency-groups]
 dev = ["pytest"]

cppcheck_py-2.22.0/scripts/vendor_cppcheck.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+"""Run before building an sdist or wheel: vendors cppcheck's source so the sdist
+is self-contained and doesn't require network access to build."""
+
+import pathlib
+import re
+import urllib.request
+
+from scikit_build_core.metadata.regex import dynamic_metadata
+
+try:
+    import tomllib
+except ModuleNotFoundError:
+    import tomli as tomllib
+
+ROOT = pathlib.Path(__file__).resolve().parent.parent
+
+with open(ROOT / "pyproject.toml", "rb") as f:
+    pyproject = tomllib.load(f)
+
+    version_entry = next(
+        e for e in pyproject["tool"]["dynamic-metadata"] if e["field"] == "version"
+    )
+    settings = {
+        k: v for k, v in version_entry.items() if k not in ("provider", "field")
+    }
+    project_version = dynamic_metadata("version", settings)
+
+cppcheck_version = re.match(r"^(\d+\.\d+\.\d+)", project_version).group(1)
+url = f"https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/{cppcheck_version}.tar.gz"
+archive_path = ROOT / "third_party" / f"cppcheck-{cppcheck_version}.tar.gz"
+if archive_path.exists():
+    print(f"{archive_path} already exists, skipping download.")
+else:
+    archive_path.parent.mkdir(parents=True, exist_ok=True)
+    print(f"Downloading {url}")
+    urllib.request.urlretrieve(url, archive_path)

{cppcheck_py-2.21.0 → cppcheck_py-2.22.0}/test/test_executable.py

@@ -1,14 +1,16 @@
 import os
-import pytest
 import sys
 import tempfile
 from pathlib import Path
 
+import pytest
+
 EXECUTABLES = (
     "cppcheck",
     "cppcheck-htmlreport",
 )
 
+
 @pytest.fixture(autouse=True)
 def ensure_cppcheck_from_wheel(monkeypatch):
     """Test the installed cppcheck package, not the local one."""
@@ -20,12 +22,12 @@ def ensure_cppcheck_from_wheel(monkeypatch):
     }
 
     sys.path[:] = [
-        path for path in sys.path
-        if Path(path).resolve() not in paths_to_remove
+        path for path in sys.path if Path(path).resolve() not in paths_to_remove
     ]
 
     monkeypatch.delitem(sys.modules, "cppcheck", raising=False)
 
+
 @pytest.mark.parametrize("executable", EXECUTABLES)
 def test_executable_file(capsys, executable):
     import cppcheck
@@ -36,14 +38,17 @@ def test_executable_file(capsys, executable):
     assert os.access(exe, os.X_OK)
     assert capsys.readouterr().out == ""
 
+
 def test_verbose_output(capsys, monkeypatch):
     import cppcheck
+
     monkeypatch.setenv("CPPCHECK_WHEEL_VERBOSE", "1")
     # need to clear cache to make sure the function is run again
     cppcheck._get_executable.cache_clear()
     cppcheck.get_executable("cppcheck")
     assert capsys.readouterr().out
 
+
 def test_cppcheck():
     import cppcheck
 
@@ -61,15 +66,17 @@ def test_cppcheck():
                 "--addon=naming",
                 "--library=std",
                 "--xml",
-                f"--output-file={str(xml_path)}",
+                f"--output-file={xml_path!s}",
                 str(compilation_unit),
-            ) == 0
+            )
+            == 0
         )
 
-        assert(
+        assert (
             cppcheck._run_python(
                 "cppcheck-htmlreport",
-                f"--file={str(xml_path)}",
-                f"--report-dir={tmpdir}/html"
-            ) == 0
-        )
+                f"--file={xml_path!s}",
+                f"--report-dir={tmpdir}/html",
+            )
+            == 0
+        )

cppcheck_py-2.21.0/CMakeLists.txt

@@ -1,74 +0,0 @@
-cmake_minimum_required(VERSION 3.16...4.0)
-project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION})
-
-message(STATUS "cppcheck-wheel version: ${SKBUILD_PROJECT_VERSION}")
-string(REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)" CPPCHECK_VERSION "${SKBUILD_PROJECT_VERSION}")
-message(STATUS "cppcheck version: ${CPPCHECK_VERSION}")
-
-# Define a build rule for cppcheck
-set(CPPCHECK_DOWNLOAD_URL "https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/${CPPCHECK_VERSION}.tar.gz")
-include(ExternalProject)
-ExternalProject_add(build-cppcheck
-  URL "${CPPCHECK_DOWNLOAD_URL}"
-  SOURCE_DIR ${CMAKE_BINARY_DIR}/cppcheck
-  BINARY_DIR ${CMAKE_BINARY_DIR}/cppcheck-build
-  DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/cppcheck-download
-  UPDATE_COMMAND ""
-  INSTALL_COMMAND ""
-  USES_TERMINAL_DOWNLOAD 1
-  USES_TERMINAL_CONFIGURE 1
-  USES_TERMINAL_BUILD 1
-  CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -U FILESDIR -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-  BUILD_COMMAND ${CMAKE_COMMAND} --build . --target cppcheck --config Release
-)
-set(config-subfolder "")
-if(CMAKE_GENERATOR MATCHES "Visual Studio")
-  set(config-subfolder "Release")
-endif()
-set(cppcheck-executable ${CMAKE_BINARY_DIR}/cppcheck-build/${config-subfolder}/bin/cppcheck${CMAKE_EXECUTABLE_SUFFIX})
-
-# Reduce the size of the executable by executing strip if it is present on the system
-find_program(STRIP_EXECUTABLE strip)
-if(STRIP_EXECUTABLE)
-  add_custom_target(
-    strip-cppcheck
-    ALL
-    COMMAND ${STRIP_EXECUTABLE} ${cppcheck-executable}
-    COMMENT "Stripping cppcheck executable for size reduction"
-  )
-  add_dependencies(strip-cppcheck build-cppcheck)
-endif()
-
-# Define an installation rule that copies the executable to our Python package
-install(
-  PROGRAMS
-  ${cppcheck-executable}
-  ${CMAKE_BINARY_DIR}/cppcheck/htmlreport/cppcheck-htmlreport
-  DESTINATION cppcheck/data
-)
-
-install(DIRECTORY
-  ${CMAKE_BINARY_DIR}/cppcheck/addons
-  DESTINATION cppcheck/data
-  FILES_MATCHING PATTERN "*.py"
-  PATTERN "test" EXCLUDE
-)
-
-install(DIRECTORY
-  ${CMAKE_BINARY_DIR}/cppcheck/cfg
-  DESTINATION cppcheck/data
-  FILES_MATCHING PATTERN "*.cfg"
-)
-
-install(DIRECTORY
-  ${CMAKE_BINARY_DIR}/cppcheck/platforms
-  DESTINATION cppcheck/data
-  FILES_MATCHING PATTERN "*.xml"
-)
-
-# Install the downloaded source archive for GPLv3 compliance.
-install(FILES
-  ${CMAKE_BINARY_DIR}/cppcheck-download/${CPPCHECK_VERSION}.tar.gz
-  DESTINATION cppcheck
-  RENAME cppcheck-${CPPCHECK_VERSION}.tar.gz
-)

cppcheck_py-2.21.0/cppcheck_version.txt

@@ -1 +0,0 @@
-2.21.0.0