From f92d3e6b7775cf7432d4cee467383d717c2b4ed8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 1 Nov 2024 15:10:13 -0500 Subject: [PATCH] remove unnecessary pushd --- .github/workflows/pr.yaml | 124 +++++++++++++++++++------------------- .gitignore | 2 +- ci/test_notebooks.sh | 2 - 3 files changed, 63 insertions(+), 65 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 850ec7e..1775afe 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,14 +17,14 @@ jobs: - conda-cpp-build - conda-cpp-tests - conda-python-build - - conda-python-tests + # - conda-python-tests - conda-notebook-tests - - wheel-build-pylibwholegraph - - wheel-tests-pylibwholegraph - - wheel-build-cugraph-dgl - - wheel-tests-cugraph-dgl - - wheel-build-cugraph-pyg - - wheel-tests-cugraph-pyg + # - wheel-build-pylibwholegraph + # - wheel-tests-pylibwholegraph + # - wheel-build-cugraph-dgl + # - wheel-tests-cugraph-dgl + # - wheel-build-cugraph-pyg + # - wheel-tests-cugraph-pyg secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12 if: always() @@ -97,58 +97,58 @@ jobs: arch: "amd64" container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10" run_script: "ci/test_notebooks.sh" - conda-python-tests: - needs: [conda-python-build, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - wheel-build-pylibwholegraph: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: pull-request - script: ci/build_wheel_pylibwholegraph.sh - wheel-tests-pylibwholegraph: - needs: [wheel-build-pylibwholegraph, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_pylibwholegraph.sh - matrix_filter: map(select(.ARCH == "amd64")) - wheel-build-cugraph-dgl: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: pull-request - script: ci/build_wheel_cugraph-dgl.sh - wheel-tests-cugraph-dgl: - needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-dgl, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_cugraph-dgl.sh - matrix_filter: map(select(.ARCH == "amd64")) - wheel-build-cugraph-pyg: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 - with: - build_type: pull-request - script: ci/build_wheel_cugraph-pyg.sh - wheel-tests-cugraph-pyg: - needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-pyg, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel_cugraph-pyg.sh - matrix_filter: map(select(.ARCH == "amd64")) + # conda-python-tests: + # needs: [conda-python-build, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12 + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + # with: + # build_type: pull-request + # wheel-build-pylibwholegraph: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 + # with: + # build_type: pull-request + # script: ci/build_wheel_pylibwholegraph.sh + # wheel-tests-pylibwholegraph: + # needs: [wheel-build-pylibwholegraph, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + # with: + # build_type: pull-request + # script: ci/test_wheel_pylibwholegraph.sh + # matrix_filter: map(select(.ARCH == "amd64")) + # wheel-build-cugraph-dgl: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 + # with: + # build_type: pull-request + # script: ci/build_wheel_cugraph-dgl.sh + # wheel-tests-cugraph-dgl: + # needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-dgl, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + # with: + # build_type: pull-request + # script: ci/test_wheel_cugraph-dgl.sh + # matrix_filter: map(select(.ARCH == "amd64")) + # wheel-build-cugraph-pyg: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 + # with: + # build_type: pull-request + # script: ci/build_wheel_cugraph-pyg.sh + # wheel-tests-cugraph-pyg: + # needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-pyg, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + # with: + # build_type: pull-request + # script: ci/test_wheel_cugraph-pyg.sh + # matrix_filter: map(select(.ARCH == "amd64")) diff --git a/.gitignore b/.gitignore index 93682a3..1ccc278 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ __pycache__ DartConfiguration.tcl .DS_Store rmm_log.txt -.ruff_cache +.ruff_cache/ # Unit test / coverage reports htmlcov/ diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 59b60e4..64134ab 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -38,8 +38,6 @@ NOTEBOOK_LIST="$(realpath "$(dirname "$0")/notebook_list.py")" EXITCODE=0 trap "EXITCODE=1" ERR - -pushd notebooks TOPLEVEL_NB_FOLDERS="$(find . -name "*.ipynb" | cut -d'/' -f2 | sort -u)" set +e # Always run nbtest in all TOPLEVEL_NB_FOLDERS, set EXITCODE to failure