Resolve conflicts

Signed-off-by: l.feng <[email protected]>
msclock · Jan 7, 2025 · 4130b71 · 4130b71
1 parent 6d05e63
commit 4130b71
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,11 +83,8 @@ 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,11 +19,7 @@ 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,11 +144,7 @@ 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,24 +3,13 @@ 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/src/_core/CMakeLists.txt b/src/_core/CMakeLists.txt
@@ -48,7 +48,6 @@ sanitize_target(${target_name})
 
 target_link_libraries(${target_name} PRIVATE ${target_name_internal})
 
-<<<<<<< before updating
 add_custom_command(
   TARGET ${target_name}
   POST_BUILD
@@ -66,16 +65,11 @@ 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,7 +21,6 @@ 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,
@@ -1821,6 +1820,4 @@ 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,7 +8,6 @@ Pybind11 _core plugin
 
 from __future__ import annotations
 
-<<<<<<< before updating
 import datetime
 import typing
 
@@ -2216,15 +2215,11 @@ 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>
@@ -2410,5 +2405,3 @@ Warning: BitProperty  # value = <BitProperty.Warning: 73>
 WarningFlags: BitProperty  # value = <BitProperty.WarningFlags: 72>
 ZerosTailIsAllowed: BitProperty  # value = <BitProperty.ZerosTailIsAllowed: 86>
 BitFileExtractor = BitStringExtractor
-=======
->>>>>>> after updating
diff --git a/vcpkg.json b/vcpkg.json
@@ -3,11 +3,7 @@
   "name": "pybit7z",
   "description": "A wrapper based on bit7z.",
   "builtin-baseline": "65be7019941e1401e02daaba0738cab2c8a4a355",
-<<<<<<< before updating
   "homepage": "https://github.com/msclock/pybit7z",
-=======
-  "homepage": "https:///msclock/pybit7z",
->>>>>>> after updating
   "dependencies": [
     "pybind11",
     {
@@ -35,11 +31,7 @@
     },
     {
       "name": "cmake-modules",
-<<<<<<< before updating
-      "version": "1.6.13"
-=======
       "version": "1.6.14"
->>>>>>> after updating
     },
     {
       "name": "robotology-cmake-ycm",