Skip to content

Commit b846e49

Browse files
committed
Use lipomerge pypi package
1 parent b900e2a commit b846e49

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "apngasm"]
22
path = apngasm
33
url = https://github.com/laggykiller/apngasm.git
4-
[submodule "lipo-dir-merge"]
5-
path = lipo-dir-merge
6-
url = https://github.com/faaxm/lipo-dir-merge.git

lipo-dir-merge

Lines changed: 0 additions & 1 deletion
This file was deleted.

pyproject.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ lint = [
3636
requires = [
3737
"py-build-cmake==0.2.0a12",
3838
"nanobind>=2.0.0",
39-
"conan>=2.0"
39+
"conan>=2.0",
40+
"lipomerge"
4041
]
4142
build-backend = "py_build_cmake.build"
4243

@@ -53,8 +54,7 @@ include = [
5354
"src-python/*",
5455
"scripts/*",
5556
"conanfile.py",
56-
"apngasm/*",
57-
"lipo-dir-merge/*.py"
57+
"apngasm/*"
5858
]
5959

6060
[tool.py-build-cmake.cmake] # How to build the CMake project
@@ -91,10 +91,4 @@ strict = ["*"]
9191

9292
[tool.mypy]
9393
python_version = "3.9"
94-
files = ["src-python", "scripts", "tests", "example"]
95-
96-
[tool.isort]
97-
extend_skip = ["lipo-dir-merge"]
98-
99-
[tool.ruff]
100-
exclude = ["lipo-dir-merge"]
94+
files = ["src-python", "scripts", "tests", "example"]

scripts/get_deps.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ def main():
152152
subprocess.run(
153153
[
154154
"python3",
155-
"lipo-dir-merge/lipo-dir-merge.py",
155+
"-m",
156+
"lipomerge",
156157
lipo_dir_merge_src,
157158
lipo_dir_merge_dst,
158159
lipo_dir_merge_result,

0 commit comments

Comments
 (0)