diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index 6293ce8e139..d84b3cbdd31 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -46,8 +46,7 @@ jobs: arr=($(conda search --override-channels -c dask/label/dev dask-core | tail -n 1)) # extract dask-core pre-release version / build - export DASK_VERSION=${arr[1]} - export DASK_BUILD=${arr[2]} + export DASK_CORE_VERSION=${arr[1]} # distributed pre-release build conda mambabuild continuous_integration/recipes/distributed \ diff --git a/continuous_integration/recipes/dask/meta.yaml b/continuous_integration/recipes/dask/meta.yaml index f7e1122e5b6..b7709b1c405 100644 --- a/continuous_integration/recipes/dask/meta.yaml +++ b/continuous_integration/recipes/dask/meta.yaml @@ -1,7 +1,7 @@ -{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev') + environ.get('VERSION_SUFFIX', '') %} -{% set dask_version = environ.get('DASK_VERSION', '0.0.0.dev') %} -{% set dask_build = environ.get('DASK_BUILD', '') %} -{% set py_version=environ.get('CONDA_PY', 36) %} +{% set major_minor_patch = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').split('.') %} +{% set new_patch = major_minor_patch[2] | int + 1 %} +{% set version = (major_minor_patch[:2] + [new_patch]) | join('.') + environ.get('VERSION_SUFFIX', '') %} +{% set dask_version = environ.get('DASK_CORE_VERSION', '0.0.0.dev') %} package: diff --git a/continuous_integration/recipes/distributed/meta.yaml b/continuous_integration/recipes/distributed/meta.yaml index fb7fa9303de..94213109128 100644 --- a/continuous_integration/recipes/distributed/meta.yaml +++ b/continuous_integration/recipes/distributed/meta.yaml @@ -1,6 +1,7 @@ -{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev') + environ.get('VERSION_SUFFIX', '') %} -{% set dask_version = environ.get('DASK_VERSION', '0.0.0.dev') %} -{% set dask_build = environ.get('DASK_BUILD', '') %} +{% set major_minor_patch = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').split('.') %} +{% set new_patch = major_minor_patch[2] | int + 1 %} +{% set version = (major_minor_patch[:2] + [new_patch]) | join('.') + environ.get('VERSION_SUFFIX', '') %} +{% set dask_version = environ.get('DASK_CORE_VERSION', '0.0.0.dev') %} package: