chore(deps): update dependency https://github.com/serious-scaffold/ss…

…-pybind11 to v0.8.31
msclock · Jan 7, 2025 · 6d05e63 · 6d05e63
1 parent 488f2e7
commit 6d05e63
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 81 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.8.25
+_commit: v0.8.31
 _src_path: https://github.com/serious-scaffold/ss-pybind11
 author_email: [email protected]
 author_name: l.feng
@@ -18,6 +18,7 @@ module_name: pybit7z
 organization_name: msclock
 project_description: A wrapper based on bit7z.
 project_name: pybit7z
+repo_host: github.com
 repo_name: pybit7z
 repo_namespace: msclock
 repo_platform: github

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,6 +83,11 @@ jobs:
 
       - name: Upload coverage report
         uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+<<<<<<< before updating
+=======
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+>>>>>>> after updating
 
 
   check-docs:

diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
@@ -19,7 +19,11 @@ jobs:
         RENOVATE_PLATFORM: github
         RENOVATE_REPOSITORIES: '["${{ github.repository }}"]'
         RENOVATE_REPOSITORY_CACHE: enabled
+<<<<<<< before updating
       image: ghcr.io/renovatebot/renovate:39.91.3@sha256:fe6475e56915dbcd948cf7b94b879d38d2c261fbe7e2b869d35556229a5fce9c
+=======
+      image: ghcr.io/renovatebot/renovate:39.91.0@sha256:60d04619493d43fe67d728121dfef56b893bf90695219d352e772e881403d158
+>>>>>>> after updating
       options: --user root
     runs-on: ubuntu-24.04
     steps:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -144,7 +144,11 @@ repos:
 
   # Check for renovate config
   - repo: https://github.com/renovatebot/pre-commit-hooks
+<<<<<<< before updating
     rev: 39.91.3
+=======
+    rev: 39.91.0
+>>>>>>> after updating
     hooks:
       - id: renovate-config-validator
         stages: [manual]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,16 +3,24 @@ message(STATUS "CMAKE VERSION:${CMAKE_VERSION}")
 
 project(
   pybit7z
+<<<<<<< before updating
   LANGUAGES C CXX
   HOMEPAGE_URL "https://github.com/msclock/pybit7z"
+=======
+  LANGUAGES CXX C
+  HOMEPAGE_URL "https:///msclock/pybit7z"
+>>>>>>> after updating
   DESCRIPTION "A wrapper based on bit7z.")
 
 # Project default module
 find_package(cmake-modules REQUIRED)
 include(cmake-modules/ProjectDefault)
+<<<<<<< before updating
 
 # Project custom modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+=======
+>>>>>>> after updating
 include(ConfigureVersion)
 
 add_subdirectory(src)
diff --git a/cmake/presets/base.json b/cmake/presets/base.json
@@ -5,63 +5,68 @@
     "toolchains/vcpkg.json"
   ],
   "configurePresets": [
+    {
+      "name": "base-common",
+      "hidden":true,
+      "binaryDir":"${sourceDir}/out/build/${presetName}",
+      "installDir":"${sourceDir}/out/install/${presetName}",
+      "cacheVariables":{
+        "CMAKE_COMPILE_WARNING_AS_ERROR":false,
+        "CMAKE_EXPORT_COMPILE_COMMANDS":true,
+        "CMAKE_VERBOSE_MAKEFILE":"FALSE"
+      }
+    },
     {
       "name": "base",
       "hidden": true,
       "inherits": [
+        "base-common",
         "ninja",
         "vcpkg"
       ],
-      "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
-        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
-        "CMAKE_COMPILE_WARNING_AS_ERROR": false,
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_VERBOSE_MAKEFILE": "FALSE"
+        "CMAKE_BUILD_TYPE": "Debug"
       }
     },
     {
       "name": "base-config",
       "hidden": true,
       "inherits": [
+        "base-common",
         "ninja-config",
         "vcpkg"
-      ],
-      "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "installDir": "${sourceDir}/out/install/${presetName}",
-      "cacheVariables": {
-        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
-        "CMAKE_COMPILE_WARNING_AS_ERROR": false,
-        "CMAKE_VERBOSE_MAKEFILE": "FALSE"
-      }
+      ]
     }
   ],
   "buildPresets": [
     {
       "name": "base",
       "hidden": true,
-      "inherits": "ninja",
       "configurePreset": "base"
     },
+    {
+      "name": "base-config-debug",
+      "hidden": true,
+      "configurePreset": "base-config",
+      "configuration": "Debug"
+    },
     {
       "name": "base-config-relwithdebinfo",
       "hidden": true,
-      "inherits": "ninja-config-relwithdebinfo",
-      "configurePreset": "base-config"
+      "configurePreset": "base-config",
+      "configuration": "RelWithDebInfo"
     },
     {
-      "name": "base-config-debug",
+      "name": "base-config-release",
       "hidden": true,
-      "inherits": "ninja-config-debug",
-      "configurePreset": "base-config"
+      "configurePreset": "base-config",
+      "configuration": "Release"
     }
   ],
   "testPresets": [
     {
       "name": "base",
       "hidden": true,
-      "inherits": "ninja",
       "configurePreset": "base",
       "output": {
         "outputOnFailure": true
@@ -74,28 +79,29 @@
     {
       "name": "base-config-relwithdebinfo",
       "hidden": true,
-      "inherits": "ninja-config-relwithdebinfo",
+      "inherits": [
+        "base"
+      ],
       "configurePreset": "base-config",
-      "output": {
-        "outputOnFailure": true
-      },
-      "execution": {
-        "noTestsAction": "error",
-        "stopOnFailure": true
-      }
+      "configuration": "RelWithDebInfo"
     },
     {
       "name": "base-config-debug",
       "hidden": true,
-      "inherits": "ninja-config-debug",
+      "inherits": [
+        "base"
+      ],
       "configurePreset": "base-config",
-      "output": {
-        "outputOnFailure": true
-      },
-      "execution": {
-        "noTestsAction": "error",
-        "stopOnFailure": true
-      }
+      "configuration": "Debug"
+    },
+    {
+      "name": "base-config-release",
+      "hidden": true,
+      "inherits": [
+        "base"
+      ],
+      "configurePreset": "base-config",
+      "configuration": "Release"
     }
   ]
 }
diff --git a/cmake/presets/default.json b/cmake/presets/default.json
@@ -32,6 +32,11 @@
       "name": "default-config-debug",
       "inherits": "base-config-debug",
       "configurePreset": "default-config"
+    },
+    {
+      "name": "default-config-release",
+      "inherits": "base-config-release",
+      "configurePreset": "default-config"
     }
   ],
   "testPresets": [
@@ -49,6 +54,11 @@
       "name": "default-config-debug",
       "inherits": "base-config-debug",
       "configurePreset": "default-config"
+    },
+    {
+      "name": "default-config-release",
+      "inherits": "base-config-release",
+      "configurePreset": "default-config"
     }
   ]
 }
diff --git a/cmake/presets/generators/ninja.json b/cmake/presets/generators/ninja.json
@@ -11,43 +11,5 @@
       "hidden": true,
       "generator": "Ninja Multi-Config"
     }
-  ],
-  "buildPresets": [
-    {
-      "name": "ninja",
-      "hidden": true,
-      "configurePreset": "ninja"
-    },
-    {
-      "name": "ninja-config-relwithdebinfo",
-      "hidden": true,
-      "configurePreset": "ninja-config",
-      "configuration": "RelWithDebInfo"
-    },
-    {
-      "name": "ninja-config-debug",
-      "hidden": true,
-      "configurePreset": "ninja-config",
-      "configuration": "Debug"
-    }
-  ],
-  "testPresets": [
-    {
-      "name": "ninja",
-      "hidden": true,
-      "configurePreset": "ninja"
-    },
-    {
-      "name": "ninja-config-relwithdebinfo",
-      "hidden": true,
-      "configurePreset": "ninja-config",
-      "configuration": "RelWithDebInfo"
-    },
-    {
-      "name": "ninja-config-debug",
-      "hidden": true,
-      "configurePreset": "ninja-config",
-      "configuration": "Debug"
-    }
   ]
 }
diff --git a/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake b/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake
@@ -207,19 +207,22 @@ macro(_vcpkg_load_triplet)
   set(_community_triplet "triplets/community/${VCPKG_TARGET_TRIPLET}.cmake")
 
   if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${_triplet}")
-    include("${CMAKE_CURRENT_LIST_DIR}/${_triplet}")
+    set(_load_triplet "${CMAKE_CURRENT_LIST_DIR}/${_triplet}")
   elseif(EXISTS "${_VCPKG_ROOT}/${_triplet}")
-    include("${_VCPKG_ROOT}/${_triplet}")
-  elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${_community_triplet}")
-    include("${CMAKE_CURRENT_LIST_DIR}/${_community_triplet}")
+    set(_load_triplet "${_VCPKG_ROOT}/${_triplet}")
   elseif(EXISTS "${_VCPKG_ROOT}/${_community_triplet}")
-    include("${_VCPKG_ROOT}/${_community_triplet}")
+    set(_load_triplet "${_VCPKG_ROOT}/${_community_triplet}")
   else()
     message(
       FATAL_ERROR
         "Triplet ${VCPKG_TARGET_TRIPLET} not found at ${CMAKE_CURRENT_LIST_DIR}/${_triplet} or ${_VCPKG_ROOT}/${_triplet}"
     )
   endif()
+
+  message(STATUS "Loading triplet: ${_load_triplet}")
+  include(${_load_triplet})
+
   unset(_triplet)
   unset(_community_triplet)
+  unset(_load_triplet)
 endmacro(_vcpkg_load_triplet)
diff --git a/noxfile.py b/noxfile.py
@@ -100,3 +100,13 @@ def build(session: nox.Session) -> None:
 
     session.install("build")
     session.run("python", "-m", "build")
+
+
+@nox.session(reuse_venv=True)
+def pyi(session: nox.Session) -> None:
+    """
+    Generate the Pyi type stubs.
+    """
+    session.install("pybind11-stubgen")
+    session.install(".[test]")
+    session.run("pybind11-stubgen", "pybit7z._core", "-o", "src")
diff --git a/src/_core/CMakeLists.txt b/src/_core/CMakeLists.txt
@@ -48,6 +48,7 @@ sanitize_target(${target_name})
 
 target_link_libraries(${target_name} PRIVATE ${target_name_internal})
 
+<<<<<<< before updating
 add_custom_command(
   TARGET ${target_name}
   POST_BUILD
@@ -65,11 +66,16 @@ install(
   COMPONENT
   Runtime)
 
+=======
+>>>>>>> after updating
 install(TARGETS ${target_name} DESTINATION ${CMAKE_PROJECT_NAME})
 
 install_dependency(TARGETS ${target_name} DEPENDS_DESTINATION
                    ${CMAKE_PROJECT_NAME})
+<<<<<<< before updating
 
 if(BUILD_TESTING)
   add_test_subdirectory(tests)
 endif()
+=======
+>>>>>>> after updating
diff --git a/src/_core/src/pybind.cpp b/src/_core/src/pybind.cpp
@@ -21,6 +21,7 @@ PYBIND11_MODULE(_core, m) {
     m.def("version", []() { return _core::ProjectVersion(); }, R"pbdoc(
         The _core plugin version.
     )pbdoc");
+<<<<<<< before updating
 
     m.def("platform_lib7zip_name",
           _core::platform_lib7zip_name,
@@ -1820,4 +1821,6 @@ The items in the first argument must be the relative or absolute paths to files
             &bit7z::BitArchiveEditor::applyChanges,
             py::doc(
                 R"pydoc(Applies the requested changes (i.e., rename/update/delete operations) to the input archive.)pydoc"));
+=======
+>>>>>>> after updating
 }
diff --git a/src/pybit7z/_core.pyi b/src/pybit7z/_core.pyi
@@ -8,6 +8,7 @@ Pybind11 _core plugin
 
 from __future__ import annotations
 
+<<<<<<< before updating
 import datetime
 import typing
 
@@ -2215,11 +2216,15 @@ def platform_lib7zip_name() -> str:
     """
     lib7zip library name for current platform.
     """
+=======
+__all__ = ["version"]
+>>>>>>> after updating
 
 def version() -> str:
     """
     The _core plugin version.
     """
+<<<<<<< before updating
 
 ATime: BitProperty  # value = <BitProperty.ATime: 11>
 AltStreamsSize: BitProperty  # value = <BitProperty.AltStreamsSize: 76>
@@ -2405,3 +2410,5 @@ Warning: BitProperty  # value = <BitProperty.Warning: 73>
 WarningFlags: BitProperty  # value = <BitProperty.WarningFlags: 72>
 ZerosTailIsAllowed: BitProperty  # value = <BitProperty.ZerosTailIsAllowed: 86>
 BitFileExtractor = BitStringExtractor
+=======
+>>>>>>> after updating