Merge branch 'branch-24.04' into b2404-cleanup-mg-tests

rapidsai · Feb 29, 2024 · 20e5208 · 20e5208
2 parents f0e9adf + ac65b17
commit 20e5208
Show file tree

Hide file tree

Showing 16 changed files with 824 additions and 229 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,6 +78,8 @@ datasets/*
 !datasets/karate-disjoint.csv
 !datasets/netscience.csv
 
+# nx-cugraph side effects
+python/nx-cugraph/objects.inv
 
 .pydevproject
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,8 +15,9 @@ repos:
     hooks:
       - id: black
         language_version: python3
-        args: [--target-version=py38]
+        args: [--target-version=py39]
         files: ^(python/.*|benchmarks/.*)$
+        exclude: ^python/nx-cugraph/
   - repo: https://github.com/PyCQA/flake8
     rev: 6.0.0
     hooks:

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -127,6 +127,13 @@ python -m nx_cugraph.scripts.print_tree --dispatch-name --plc --incomplete --dif
 python -m nx_cugraph.scripts.print_table
 popd
 
+rapids-logger "ensure nx-cugraph autogenerated files are up to date"
+pushd python/nx-cugraph
+make || true
+git diff --exit-code .
+git checkout .
+popd
+
 rapids-logger "pytest cugraph-service (single GPU)"
 ./ci/run_cugraph_service_pytests.sh \
   --verbose \