Skip to content

Commit

Permalink
resolve rapids-dependency-file-generator warning (#1735)
Browse files Browse the repository at this point in the history
Contributes to rapidsai/dependency-file-generator#89.

`--file_key` has been deprecated in `rapids-dependency-file-generator` for a few months, and I'm looking to fully remove it.

This PR proposes:

* switching this project's uses from `--file_key` to `--file-key`
* updating the version of `rapids-dependency-file-generator` used in `pre-commit` to its latest release

## By Submitting this PR I confirm:

- I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md).
- When the PR is ready for review, new or existing tests cover these changes.
- When the PR is ready for review, the documentation is up to date with these changes.

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Christopher Harris (https://github.com/cwharris)

Approvers:
  - David Gardner (https://github.com/dagardner-nv)

URL: #1735
  • Loading branch information
jameslamb authored Jun 25, 2024
1 parent b4829f6 commit 7ec58a7
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ jobs:
# Disable conda upload for now, once we have morpheus packages in conda forge set the value to
# !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || ''
conda_upload_label: ""
container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240524
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240524
container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240614
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240614
secrets:
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

repos:
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.7.1
rev: v1.13.11
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
2 changes: 1 addition & 1 deletion ci/check_style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rapids-logger "Create checks conda environment"

rapids-dependency-file-generator \
--output conda \
--file_key checks \
--file-key checks \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml

rapids-mamba-retry env create --yes -f env.yaml -n checks
Expand Down
12 changes: 8 additions & 4 deletions ci/runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# syntax=docker/dockerfile:1.3

# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
Expand Down Expand Up @@ -37,6 +35,12 @@ SHELL ["/bin/bash", "-c"]
# Create conda environment
COPY ./dependencies.yaml /tmp/conda/

RUN <<EOF
rapids-mamba-retry install -y \
"rapids-dependency-file-generator>=1.13.*"
conda clean -aipty
EOF

# ============ build ==================
FROM base as build

Expand All @@ -48,7 +52,7 @@ ARG PYTHON_VER
RUN rapids-dependency-file-generator \
--config /tmp/conda/dependencies.yaml \
--output conda \
--file_key build \
--file-key build \
--matrix "cuda=${CUDA_SHORT_VER};arch=${ARCH};py=${PYTHON_VER}" > /tmp/conda/env.yaml && \
CONDA_ALWAYS_YES=true /opt/conda/bin/conda env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \
sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc && \
Expand Down Expand Up @@ -89,7 +93,7 @@ RUN apt update && \
RUN rapids-dependency-file-generator \
--config /tmp/conda/dependencies.yaml \
--output conda \
--file_key test \
--file-key test \
--matrix "cuda=${CUDA_SHORT_VER};arch=${ARCH};py=${PYTHON_VER}" > /tmp/conda/env.yaml && \
CONDA_ALWAYS_YES=true /opt/conda/bin/conda env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \
sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc && \
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/github/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh

rapids-dependency-file-generator \
--output conda \
--file_key build \
--file-key build \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml"

update_conda_env "${WORKSPACE_TMP}/env.yaml"
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/github/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh

rapids-dependency-file-generator \
--output conda \
--file_key build \
--file-key build \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml"

update_conda_env "${WORKSPACE_TMP}/env.yaml"
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/github/docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh

rapids-dependency-file-generator \
--output conda \
--file_key docs \
--file-key docs \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml"

update_conda_env "${WORKSPACE_TMP}/env.yaml"
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/github/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh

rapids-dependency-file-generator \
--output conda \
--file_key test \
--file-key test \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml"

update_conda_env "${WORKSPACE_TMP}/env.yaml"
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/run_ci_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ GIT_BRANCH=$(git branch --show-current)
GIT_COMMIT=$(git log -n 1 --pretty=format:%H)

LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp}
CONTAINER_VER=${CONTAINER_VER:-240524}
CONTAINER_VER=${CONTAINER_VER:-240614}
CUDA_VER=${CUDA_VER:-12.1}
DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}

Expand Down

0 comments on commit 7ec58a7

Please sign in to comment.