Merge pull request #49 from rapidsai/branch-24.12

Forward-merge branch-24.12 into branch-25.02
rapidsai · Nov 22, 2024 · e98d5c4 · e98d5c4
2 parents e45d0a7 + 5ed1e53
commit e98d5c4
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 8 deletions.
diff --git a/.flake8 b/.flake8
@@ -14,5 +14,5 @@ per-file-ignores =
     __init__.py:F401,F403,
     _nx_cugraph/__init__.py:E501,
     nx_cugraph/__init__.py:E402,F401,F403,
-    benchmarks/nx-cugraph/pytest-based/create_results_summary_page.py:E501,W605,
+    benchmarks/pytest-based/create_results_summary_page.py:E501,W605,
     docs/nx-cugraph/source/conf.py:E501
diff --git a/benchmarks/nx-cugraph/pytest-based/README.md → benchmarks/pytest-based/README.md b/benchmarks/nx-cugraph/pytest-based/README.md → benchmarks/pytest-based/README.md
diff --git a/...ks/nx-cugraph/pytest-based/bench_algos.py → benchmarks/pytest-based/bench_algos.py b/...ks/nx-cugraph/pytest-based/bench_algos.py → benchmarks/pytest-based/bench_algos.py
diff --git a/...test-based/create_results_summary_page.py → ...test-based/create_results_summary_page.py b/...test-based/create_results_summary_page.py → ...test-based/create_results_summary_page.py
diff --git a/...h/pytest-based/get_graph_bench_dataset.py → ...s/pytest-based/get_graph_bench_dataset.py b/...h/pytest-based/get_graph_bench_dataset.py → ...s/pytest-based/get_graph_bench_dataset.py
diff --git a/...marks/nx-cugraph/pytest-based/run-2402.sh → benchmarks/pytest-based/run-2402.sh b/...marks/nx-cugraph/pytest-based/run-2402.sh → benchmarks/pytest-based/run-2402.sh
diff --git a/...graph/pytest-based/run-main-benchmarks.sh → ...marks/pytest-based/run-main-benchmarks.sh b/...graph/pytest-based/run-main-benchmarks.sh → ...marks/pytest-based/run-main-benchmarks.sh
diff --git a/benchmarks/pytest.ini b/benchmarks/pytest.ini
@@ -1,11 +1,4 @@
 [pytest]
-pythonpath =
-    shared/python
-
-testpaths =
-    cugraph/pytest_based
-    cugraph-service/pytest_based
-
 addopts =
     --benchmark-columns="min, max, mean, stddev, outliers"
     --tb=native