From 8d48de50f3856d55add7eaca72c535d6c3937cbe Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Asterodeia" Date: Sun, 3 Aug 2025 18:23:30 +0800 Subject: [PATCH 1/6] ... --- build.py | 2 ++ pyproject.toml | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 build.py diff --git a/build.py b/build.py new file mode 100644 index 0000000..62257e6 --- /dev/null +++ b/build.py @@ -0,0 +1,2 @@ +import os +os.system("./install-go-dependencies.sh") diff --git a/pyproject.toml b/pyproject.toml index ecfab90..5ab0aab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,3 +57,6 @@ include = [ { path = "*.png", format = ["sdist", "wheel"] }, { path = "agrf/gorender/bin/*", format = ["sdist", "wheel"] }, ] + +[tool.poetry.build] +script = "build.py" From 541cea4e87ca53592367227d18151847fec36e7d Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Asterodeia" Date: Sun, 3 Aug 2025 18:24:42 +0800 Subject: [PATCH 2/6] .. --- .github/workflows/build.yml | 2 -- .github/workflows/unit-tests.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7adca2..193849f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install golang deps - run: ./install-go-dependencies.sh - name: Install system python deps run: sudo apt update && sudo apt install python3-ply python3-pil libjpeg-dev zlib1g-dev - name: Get setuptools diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index e722cab..3de4f27 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -24,8 +24,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@main - - name: Install golang deps - run: ./install-go-dependencies.sh - name: Install system python deps run: sudo apt update && sudo apt install python3-ply python3-pil libjpeg-dev zlib1g-dev - name: Get setuptools From feeb6a5f32339d0d34bb59342d17c8c785342b0f Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Asterodeia" Date: Sun, 3 Aug 2025 18:42:11 +0800 Subject: [PATCH 3/6] ... --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 193849f..964e6a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,4 +25,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: agrf.whl - path: dist/agrf-0.0.1-py3-none-any.whl + path: dist/agrf-0.0.1-cp313-cp313-manylinux_2_41_x86_64.whl From 867ddb30f491891c04fa7b93bead48eb759ea668 Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Asterodeia" Date: Sun, 3 Aug 2025 18:44:43 +0800 Subject: [PATCH 4/6] .. --- build.py | 2 -- pyproject.toml | 2 +- install-go-dependencies.sh => tools/install-deps.py | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 build.py rename install-go-dependencies.sh => tools/install-deps.py (92%) mode change 100755 => 100644 diff --git a/build.py b/build.py deleted file mode 100644 index 62257e6..0000000 --- a/build.py +++ /dev/null @@ -1,2 +0,0 @@ -import os -os.system("./install-go-dependencies.sh") diff --git a/pyproject.toml b/pyproject.toml index 5ab0aab..727069a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,4 +59,4 @@ include = [ ] [tool.poetry.build] -script = "build.py" +script = "tools/install-deps.py" diff --git a/install-go-dependencies.sh b/tools/install-deps.py old mode 100755 new mode 100644 similarity index 92% rename from install-go-dependencies.sh rename to tools/install-deps.py index 3a3773b..8738a9e --- a/install-go-dependencies.sh +++ b/tools/install-deps.py @@ -1,4 +1,5 @@ -#!/bin/bash +import os +os.system(""" export GOPATH=$PWD/agrf/gorender/ go install github.com/ahyangyi/gorender/cmd@cdca513 mv ${GOPATH}/bin/cmd ${GOPATH}/bin/gorender @@ -7,3 +8,4 @@ go install github.com/ahyangyi/gandalf/cmd@v1.4.0-ah4 mv ${GOPATH}/bin/cmd ${GOPATH}/bin/layer-filter strip ${GOPATH}/bin/* +""") From cc83b46b2cef18a519394bdb7b9a608e4d88e371 Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Asterodeia" Date: Sun, 3 Aug 2025 18:55:00 +0800 Subject: [PATCH 5/6] ..... --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 964e6a8..426a8e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,4 +25,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: agrf.whl - path: dist/agrf-0.0.1-cp313-cp313-manylinux_2_41_x86_64.whl + path: dist/agrf-0.0.1-cp312-cp312-manylinux_2_41_x86_64.whl From fb47428cea0f604e6349f6d5bc85122010f82fd6 Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Asterodeia" Date: Sun, 3 Aug 2025 18:55:19 +0800 Subject: [PATCH 6/6] ... --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 426a8e1..be4dde6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,4 +25,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: agrf.whl - path: dist/agrf-0.0.1-cp312-cp312-manylinux_2_41_x86_64.whl + path: dist/agrf*.whl