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

cppcheck_py-2.21.1/.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.21.1/CMakeLists.txt

@@ -0,0 +1,101 @@
+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}")
+
+include(CheckIncludeFileCXX)
+# Check for the execinfo header, needed for backtraces support.
+check_include_file_cxx("execinfo.h" HAVE_EXECINFO_H)
+
+set(CMAKE_ARGS
+    -DCMAKE_BUILD_TYPE=Release
+    -U
+    FILESDIR
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+)
+if(NOT HAVE_EXECINFO_H)
+    message(STATUS "execinfo.h not found, disabling backtrace support")
+    list(APPEND CMAKE_ARGS -DNO_UNIX_BACKTRACE_SUPPORT=ON)
+endif()
+
+# 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 ${CMAKE_ARGS}
+    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_py-2.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cppcheck-py
-Version: 2.21.0
+Version: 2.21.1
 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
 

{cppcheck_py-2.21.0 → cppcheck_py-2.21.1}/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.21.1/cppcheck_version.txt

@@ -0,0 +1 @@
+2.21.1.0

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

@@ -8,6 +8,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,7 +37,7 @@ Source = "https://github.com/cconverse711/cppcheck-wheel"
 
 [tool.scikit-build]
 wheel.packages = ["cppcheck"]
-wheel.py-api = "py2.py3"
+wheel.py-api = "py3"
 cmake.version = ">=3.16.0"
 ninja.version = ">=1.10.0"
 build.verbose = true

{cppcheck_py-2.21.0 → cppcheck_py-2.21.1}/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