diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7adca2..be4dde6 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 @@ -27,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*.whl 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 diff --git a/pyproject.toml b/pyproject.toml index ecfab90..727069a 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 = "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/* +""")