From 9d6fc914d8770b400b395a9739ad267fb38e5e6e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 30 Jan 2024 15:25:32 -0600 Subject: [PATCH 1/2] add rapids-dependency-file-generator pre-commmit hook (#682) Proposes adding a pre-commit hook to run `rapids-dependency-file-generator`. With that change, local `pre-commit` and CI will raise an error if changes have been made in `dependencies.yaml` that would affect any other files checked into the repo, like the conda envs in https://github.com/rapidsai/cucim/tree/branch-24.02/conda/environments. ### How I tested this Changed a `cmake` version constraint in `dependencies.yaml`. Ran `pre-commit run --all-files`. Observed the expected failure. image Reverted that change, ran `pre-commit run --all-files` again, saw everything pass. Authors: - James Lamb (https://github.com/jameslamb) - https://github.com/jakirkham Approvers: - https://github.com/jakirkham - Bradley Dice (https://github.com/bdice) - Ray Douglass (https://github.com/raydouglass) - Gregory Lee (https://github.com/grlee77) URL: https://github.com/rapidsai/cucim/pull/682 --- .pre-commit-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e12e83ae3..bfffa3dca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,3 +28,8 @@ repos: args: ["--toml", "python/cucim/pyproject.toml"] additional_dependencies: - tomli + - repo: https://github.com/rapidsai/dependency-file-generator + rev: v1.8.0 + hooks: + - id: rapids-dependency-file-generator + args: ["--clean"] From d4ec01eb53afceaaeec36856e1dcbf2c282659d0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 5 Feb 2024 12:46:11 -0800 Subject: [PATCH 2/2] Fix `popd` indent in `run` (#693) This was added in PR ( https://github.com/rapidsai/cucim/pull/683 ), but it looks like the indentation was wrong. This corrects that. Behavior should be the same in either case. Just makes the intent clearer by improving readability. Authors: - https://github.com/jakirkham Approvers: - Gregory Lee (https://github.com/grlee77) URL: https://github.com/rapidsai/cucim/pull/693 --- run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run b/run index c8bec742e..3a8693531 100755 --- a/run +++ b/run @@ -614,7 +614,7 @@ install_python_test_deps_() { else run_command pip3 install --user -e .[test] fi - popd + popd fi hash -r }