From 1f7989e1765386e73a18c8085f47b4300441be49 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 13 Mar 2024 20:19:47 -0700 Subject: [PATCH] [ci] Disable dartpy test with pixi for now --- .github/workflows/ci_macos.yml | 4 +++- .github/workflows/ci_ubuntu.yml | 4 +++- .github/workflows/ci_windows.yml | 7 ++++++- pixi.toml | 10 ++++++++-- pyproject.toml | 4 ++++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml index 9f2f637003d27..b5e243387ac18 100644 --- a/.github/workflows/ci_macos.yml +++ b/.github/workflows/ci_macos.yml @@ -63,4 +63,6 @@ jobs: - name: Test DART and dartpy run: | - pixi run test_all + pixi run test + pixi run test_dartpy + diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 21bc46b45dbc8..4145fe4a8e5ae 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -88,4 +88,6 @@ jobs: - name: Test DART and dartpy run: | - pixi run test_all + pixi run test + pixi run test_dartpy + diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 3374f98ca09ce..f775090ff5edf 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -87,6 +87,11 @@ jobs: with: cache: true + - name: Check Lint + run: pixi run check-lint + - name: Test DART and dartpy run: | - pixi run test_all + pixi run test + pixi run test_dartpy + diff --git a/pixi.toml b/pixi.toml index e5e61959623b0..a3a8c42a1b930 100644 --- a/pixi.toml +++ b/pixi.toml @@ -8,8 +8,6 @@ platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"] [tasks] clean = "rm -rf build" -lint = { cmd= "cmake --build build --target format", depends_on = ["configure"] } -check-lint = { cmd= "cmake --build build --target check-format", depends_on = ["configure"] } [dependencies] assimp = ">=5.3.1,<5.4" @@ -50,6 +48,8 @@ xorg-libx11 = ">=1.8.7,<1.9" [target.linux-64.tasks] configure = "cmake -G Ninja -S . -B build -DDART_VERBOSE=ON" +lint = { cmd= "cmake --build build --target format && black . && isort .", depends_on = ["configure"] } +check-lint = { cmd= "black . --check && isort . --check", depends_on = ["configure"] } build = { cmd = "cmake --build build -j --target all", depends_on = [ "configure", ] } @@ -71,6 +71,8 @@ clang-format-14 = ">=14.0.6,<14.1" [target.osx-64.tasks] configure = "cmake -G Ninja -S . -B build -DDART_VERBOSE=ON" +lint = { cmd= "cmake --build build --target format && black . && isort .", depends_on = ["configure"] } +check-lint = { cmd= "cmake --build build --target check-format && black . --check && isort . --check", depends_on = ["configure"] } build = { cmd = "cmake --build build -j --target all", depends_on = [ "configure", ] } @@ -92,6 +94,8 @@ clang-format-14 = ">=14.0.6,<14.1" [target.osx-arm64.tasks] configure = "cmake -G Ninja -S . -B build -DDART_VERBOSE=ON" +lint = { cmd= "cmake --build build --target format && black . && isort .", depends_on = ["configure"] } +check-lint = { cmd= "cmake --build build --target check-format && black . --check && isort . --check", depends_on = ["configure"] } build = { cmd = "cmake --build build -j --target all", depends_on = [ "configure", ] } @@ -116,6 +120,8 @@ freeglut = ">=3.2.2,<3.3" [target.win-64.tasks] configure = "cmake -S . -B build -G 'Visual Studio 17 2022' -DCMAKE_BUILD_TYPE=Release -DDART_MSVC_DEFAULT_OPTIONS=ON -DBUILD_SHARED_LIBS=OFF -DDART_VERBOSE=ON" +lint = { cmd= "black . && isort .", depends_on = ["configure"] } +check-lint = { cmd= "black . --check && isort . --check", depends_on = ["configure"] } build = { cmd = "cmake --build build --config Release -j --target all", depends_on = [ "configure", ] } diff --git a/pyproject.toml b/pyproject.toml index f6f940f9514fc..43365537ff9de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,12 @@ requires = ["setuptools>=42", "wheel", "ninja", "cmake>=3.12", "requests"] build-backend = "setuptools.build_meta" +[tool.black] +exclude = '/(build|dist|docs|examples|external|python|\.pixi)/' + [tool.isort] profile = "black" +skip = ['build', 'dist', 'docs', 'examples', 'external', 'python', '.pixi'] [tool.mypy] files = "setup.py"