From 951f630dfe4a5ec5a5afceae4dd97e98e5e8b93f Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 11 Jan 2022 09:40:28 -0500 Subject: [PATCH] Fix `conda` recipes for `custreamz` & `cudf_kafka` (#10003) This PR updates the `conda` recipes for `custreamz` and `cudf_kafka`. The environment variable should be `PYTHON`, not `python` (case sensitive). Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) - Jeremy Dyer (https://github.com/jdye64) - GALI PREM SAGAR (https://github.com/galipremsagar) URL: https://github.com/rapidsai/cudf/pull/10003 --- conda/recipes/cudf_kafka/meta.yaml | 7 ++++--- conda/recipes/custreamz/meta.yaml | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index d434e53c9b1..571d1bdea8f 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -3,7 +3,8 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA', '11.5').split('.')[:2]) %} -{% set py_version = environ.get('python', '3.8') %} +{% set py_version = environ.get('PY_VER', '3.8') %} +{% set py_version_numeric = py_version.replace('.', '') %} package: name: cudf_kafka @@ -14,7 +15,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: py{{ py_version.replace('.', '') }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: py{{ py_version_numeric }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - CC - CXX @@ -34,7 +35,7 @@ requirements: run: - python {{ py_version }} - libcudf_kafka {{ version }} - - python-confluent-kafka >=1.7.0,<1.8.0a0=py{{ py_version.replace('.', '') }}* + - python-confluent-kafka >=1.7.0,<1.8.0a0=py{{ py_version_numeric }}* - cudf {{ version }} test: # [linux64] diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 73f4727b70b..7d9529257e6 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -3,7 +3,8 @@ {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set cuda_version = '.'.join(environ.get('CUDA', '11.5').split('.')[:2]) %} -{% set py_version = environ.get('python', '3.8') %} +{% set py_version = environ.get('PY_VER', '3.8') %} +{% set py_version_numeric = py_version.replace('.', '') %} package: name: custreamz @@ -14,7 +15,7 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} - string: py{{ py_version.replace('.', '') }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} + string: py{{ py_version_numeric }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script_env: - VERSION_SUFFIX - PARALLEL_LEVEL @@ -25,15 +26,15 @@ build: requirements: host: - python {{ py_version }} - - python-confluent-kafka >=1.7.0,<1.8.0a0=py{{ py_version.replace('.', '') }}* + - python-confluent-kafka >=1.7.0,<1.8.0a0=py{{ py_version_numeric }}* - cudf_kafka {{ version }} run: - python {{ py_version }} - - streamz + - streamz - cudf {{ version }} - dask>=2021.11.1,<=2021.11.2 - distributed>=2021.11.1,<=2021.11.2 - - python-confluent-kafka >=1.7.0,<1.8.0a0=py{{ py_version.replace('.', '') }}* + - python-confluent-kafka >=1.7.0,<1.8.0a0=py{{ py_version_numeric }}* - cudf_kafka {{ version }} test: # [linux64]