From 12cf43ce28c87cdc6faa535ce94217d8e9969f5e Mon Sep 17 00:00:00 2001 From: Elssky <1914127671@qq.com> Date: Wed, 27 Nov 2024 10:40:48 +0800 Subject: [PATCH 1/4] chore(ci): Upgrade artifact actions from v3 to v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 430adc089..565a3e524 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,7 +179,7 @@ jobs: - name: Upload libgraphar.a artifact if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ubuntu-libgraphar.a path: cpp/build-static/libgraphar.a @@ -237,7 +237,7 @@ jobs: - name: Upload libgraphar.a artifact if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos-${{ matrix.macos-version }}-libgraphar.a path: cpp/build-static/libgraphar.a \ No newline at end of file From 6186ee3d99c798fd22dc6e0bb24112f27012d449 Mon Sep 17 00:00:00 2001 From: jasinliu <939282975@qq.com> Date: Thu, 28 Nov 2024 07:26:23 +0800 Subject: [PATCH 2/4] and ninja requirement in cli --- cli/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/pyproject.toml b/cli/pyproject.toml index 8c0003a0b..636a90b75 100644 --- a/cli/pyproject.toml +++ b/cli/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["scikit-build-core>=0.3.3", "pybind11"] +requires = ["scikit-build-core>=0.3.3", "pybind11", "ninja ~= 1.11"] build-backend = "scikit_build_core.build" From f1beded1abee2450ddc0b7bc487ddb628c63edc3 Mon Sep 17 00:00:00 2001 From: jasinliu <939282975@qq.com> Date: Thu, 28 Nov 2024 07:29:09 +0800 Subject: [PATCH 3/4] move ninja in dependency --- cli/pyproject.toml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cli/pyproject.toml b/cli/pyproject.toml index 636a90b75..db13ab504 100644 --- a/cli/pyproject.toml +++ b/cli/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["scikit-build-core>=0.3.3", "pybind11", "ninja ~= 1.11"] +requires = ["scikit-build-core>=0.3.3", "pybind11"] build-backend = "scikit_build_core.build" @@ -10,7 +10,12 @@ description = "GraphAr command line tool" readme = "README.md" authors = [{ name = "GraphAr community", email = "dev@graphar.apache.org" }] requires-python = ">=3.7" -dependencies = ["typer ~= 0.1", "pydantic ~= 2.0, < 2.7", "pyyaml ~= 6.0"] +dependencies = [ + "typer ~= 0.1", + "pydantic ~= 2.0, < 2.7", + "pyyaml ~= 6.0", + "ninja ~= 1.11", +] [project.optional-dependencies] test = ["pandas ~= 2.0", "typing_extensions ~= 4.0"] From 5b0f88a30411b9507f42e9b4b61c26d515ab6057 Mon Sep 17 00:00:00 2001 From: Liu Jiajun <939282975@qq.com> Date: Wed, 18 Dec 2024 01:32:44 +0800 Subject: [PATCH 4/4] Revert "move ninja in dependency" This reverts commit f1beded1abee2450ddc0b7bc487ddb628c63edc3. --- cli/pyproject.toml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cli/pyproject.toml b/cli/pyproject.toml index db13ab504..636a90b75 100644 --- a/cli/pyproject.toml +++ b/cli/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["scikit-build-core>=0.3.3", "pybind11"] +requires = ["scikit-build-core>=0.3.3", "pybind11", "ninja ~= 1.11"] build-backend = "scikit_build_core.build" @@ -10,12 +10,7 @@ description = "GraphAr command line tool" readme = "README.md" authors = [{ name = "GraphAr community", email = "dev@graphar.apache.org" }] requires-python = ">=3.7" -dependencies = [ - "typer ~= 0.1", - "pydantic ~= 2.0, < 2.7", - "pyyaml ~= 6.0", - "ninja ~= 1.11", -] +dependencies = ["typer ~= 0.1", "pydantic ~= 2.0, < 2.7", "pyyaml ~= 6.0"] [project.optional-dependencies] test = ["pandas ~= 2.0", "typing_extensions ~= 4.0"]