Skip to content

Commit c0c2ad3

Browse files
authored
resolve dependency-file-generator warning, remove unnecessary rapids-build-backend configuration (#15980)
Contributes to rapidsai/build-planning#31 Contributes to rapidsai/dependency-file-generator#89 #15245 was one of the first `rapids-build-backend` PRs merged across RAPIDS. Since it was merged, we've made some small adjustments to the approach for `rapids-build-backend`. This catches `cudf` up with those changes: * consolidates version-handling in `ci/build_cpp.sh` * removes `commit-file` configuration in `pyproject.toml` - *as of rapidsai/rapids-build-backend#30, this is no longer necessary if the project's top-level directory is `{project_name}.replace("-", "_")* - *and anyway, it was changed from `commit-file` to `commit-files` in that PR, so `commit-file` was being silently ignored here* * uses `--file-key` instead of `--file_key` in `rapids-dependency-file-generator` calls Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Bradley Dice (https://github.com/bdice) URL: #15980
1 parent e57f0fe commit c0c2ad3

13 files changed

+8
-15
lines changed

ci/build_cpp.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ export CMAKE_GENERATOR=Ninja
1313

1414
rapids-print-env
1515

16-
version=$(rapids-generate-version)
17-
1816
rapids-logger "Begin cpp build"
1917

2018
# With boa installed conda build forward to boa
21-
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
19+
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
2220
conda/recipes/libcudf
2321

2422
rapids-upload-conda-to-s3 cpp

ci/build_docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ENV_YAML_DIR="$(mktemp -d)"
1414

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

2020
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n docs

ci/check_style.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV_YAML_DIR="$(mktemp -d)"
1010

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

1616
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n checks

ci/configure_cpp_static.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REQUIREMENTS_FILE="${ENV_YAML_DIR}/requirements.txt"
1212

1313
rapids-dependency-file-generator \
1414
--output requirements \
15-
--file_key test_static_build \
15+
--file-key test_static_build \
1616
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee "${REQUIREMENTS_FILE}"
1717

1818
python -m pip install -r "${REQUIREMENTS_FILE}"

ci/test_cpp_common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV_YAML_DIR="$(mktemp -d)"
1111

1212
rapids-dependency-file-generator \
1313
--output conda \
14-
--file_key test_cpp \
14+
--file-key test_cpp \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee "${ENV_YAML_DIR}/env.yaml"
1616

1717
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test

ci/test_java.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV_YAML_DIR="$(mktemp -d)"
1111

1212
rapids-dependency-file-generator \
1313
--output conda \
14-
--file_key test_java \
14+
--file-key test_java \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee "${ENV_YAML_DIR}/env.yaml"
1616

1717
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test

ci/test_notebooks.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV_YAML_DIR="$(mktemp -d)"
1111

1212
rapids-dependency-file-generator \
1313
--output conda \
14-
--file_key test_notebooks \
14+
--file-key test_notebooks \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
1616

1717
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test

ci/test_python_common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV_YAML_DIR="$(mktemp -d)"
1313

1414
rapids-dependency-file-generator \
1515
--output conda \
16-
--file_key test_python \
16+
--file-key test_python \
1717
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
1818

1919
rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n test

python/cudf/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ skip = [
119119

120120
[tool.rapids-build-backend]
121121
build-backend = "scikit_build_core.build"
122-
commit-file = "cudf/GIT_COMMIT"
123122
dependencies-file = "../../dependencies.yaml"
124123
requires = [
125124
"cmake>=3.26.4",

python/cudf_kafka/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ regex = "(?P<value>.*)"
9999

100100
[tool.rapids-build-backend]
101101
build-backend = "scikit_build_core.build"
102-
commit-file = "cudf_kafka/GIT_COMMIT"
103102
dependencies-file = "../../dependencies.yaml"
104103
requires = [
105104
"cmake>=3.26.4",

python/cudf_polars/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ docstring-code-format = true
174174

175175
[tool.rapids-build-backend]
176176
build-backend = "setuptools.build_meta"
177-
commit-file = "cudf_polars/GIT_COMMIT"
178177
dependencies-file = "../../dependencies.yaml"
179178
# Pure python
180179
disable-cuda = true

python/custreamz/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ Homepage = "https://github.com/rapidsai/cudf"
4848

4949
[tool.rapids-build-backend]
5050
build-backend = "setuptools.build_meta"
51-
commit-file = "custreamz/COMMIT_FILE"
5251
dependencies-file = "../../dependencies.yaml"
5352

5453
[tool.setuptools]

python/dask_cudf/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Homepage = "https://github.com/rapidsai/cudf"
5757

5858
[tool.rapids-build-backend]
5959
build-backend = "setuptools.build_meta"
60-
commit-file = "dask_cudf/GIT_COMMIT"
6160
dependencies-file = "../../dependencies.yaml"
6261

6362
[tool.setuptools]

0 commit comments

Comments
 (0)