cppcheck 1.0.3__tar.gz → 1.1.2__tar.gz

{cppcheck-1.0.3 → cppcheck-1.1.2}/.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.0.3 → cppcheck-1.1.2}/PKG-INFO

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

{cppcheck-1.0.3 → cppcheck-1.1.2}/cmake/vcpkg/ports/cppcheck/portfile.cmake

@@ -15,7 +15,24 @@ vcpkg_replace_string("${SOURCE_PATH}/cmake/compilerDefinitions.cmake"
   [[]]
 )
 
-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+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
+        have_rules                  HAVE_RULES
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    ${FEATURE_OPTIONS}
+)
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()

{cppcheck-1.0.3 → cppcheck-1.1.2}/cmake/vcpkg/ports/cppcheck/vcpkg.json

@@ -13,5 +13,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "have-rules": {
+      "description": "Dependencies for testing",
+      "supports": "!windows | !osx"
+    }
+  }
 }

{cppcheck-1.0.3 → cppcheck-1.1.2}/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.0.3 → cppcheck-1.1.2}/src/cppcheck/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.3'
-__version_tuple__ = version_tuple = (1, 0, 3)
+__version__ = version = '1.1.2'
+__version_tuple__ = version_tuple = (1, 1, 2)

cppcheck-1.1.2/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.0.3 → cppcheck-1.1.2}/vcpkg.json

@@ -5,7 +5,12 @@
   "builtin-baseline": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3",
   "homepage": "https://github.com/msclock/cppcheck-wheel",
   "dependencies": [
-    "cppcheck",
+    {
+      "name": "cppcheck",
+      "features": [
+        "have-rules"
+      ]
+    },
     "cmake-modules",
     "robotology-cmake-ycm"
   ],

cppcheck-1.0.3/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__