From 7d49f75df9681dbe1653029e7d508355884a6d86 Mon Sep 17 00:00:00 2001 From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com> Date: Tue, 30 Mar 2021 10:46:20 -0400 Subject: [PATCH] Update conda recipes pinning of repo dependencies (#7743) Ensure all conda packages created in this repo that depend on other packages are all version pinned to the same build number. This way it prevents a conda solve from picking mismatched versions of `cudf` and `libcudf` among others that can break this repo and others. Authors: - Mike Wendt (@mike-wendt) Approvers: - Ray Douglass (@raydouglass) URL: https://github.com/rapidsai/cudf/pull/7743 --- conda/recipes/cudf/meta.yaml | 2 +- conda/recipes/cudf_kafka/meta.yaml | 8 ++++---- conda/recipes/custreamz/meta.yaml | 8 ++++---- conda/recipes/dask-cudf/meta.yaml | 6 +++--- conda/recipes/libcudf_kafka/meta.yaml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 5635f54ba20..a119040bbcf 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -28,7 +28,7 @@ requirements: - numba >=0.49.0 - dlpack - pyarrow 1.0.1 - - libcudf {{ version }} + - libcudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} - rmm {{ minor_version }} - cudatoolkit {{ cuda_version }} run: diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index 0acd9ec4bb2..cc3f30091bf 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -29,12 +29,12 @@ requirements: - python - cython >=0.29,<0.30 - setuptools - - cudf {{ version }} - - libcudf_kafka {{ version }} + - cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} + - libcudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} run: - - libcudf_kafka {{ version }} + - libcudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} - python-confluent-kafka - - cudf {{ version }} + - cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} test: requires: diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index ffda6d0c3c6..8edca7a51d0 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -23,15 +23,15 @@ requirements: host: - python - python-confluent-kafka - - cudf_kafka {{ version }} + - cudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} run: - python - - streamz - - cudf {{ version }} + - streamz + - cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} - dask >=2.22.0 - distributed >=2.22.0 - python-confluent-kafka - - cudf_kafka {{ version }} + - cudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} test: requires: diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 170075743bd..04992f8e481 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -22,15 +22,15 @@ build: requirements: host: - python - - cudf {{ version }} + - cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} - dask >=2.22.0 - distributed >=2.22.0 run: - python - - cudf {{ version }} + - cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} - dask >=2.22.0 - distributed >=2.22.0 - + test: requires: - cudatoolkit {{ cuda_version }}.* diff --git a/conda/recipes/libcudf_kafka/meta.yaml b/conda/recipes/libcudf_kafka/meta.yaml index 5348ec471e9..81ff922b8d7 100644 --- a/conda/recipes/libcudf_kafka/meta.yaml +++ b/conda/recipes/libcudf_kafka/meta.yaml @@ -25,7 +25,7 @@ requirements: build: - cmake >=3.17.0 host: - - libcudf {{ version }} + - libcudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }} - librdkafka >=1.5.0,<1.5.3 run: - {{ pin_compatible('librdkafka', max_pin='x.x') }} #TODO: librdkafka should be automatically included here by run_exports but is not