diff --git a/CHANGELOG.md b/CHANGELOG.md index a4078f626..12c48aeb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - PR #260 Replace RMM `cnmem_memory_resource` with `pool_memory_resource` in benchmark fixture. - PR #264 Rename `quad_bbox_join` to `join_quadtree_and_bounding_boxes`. - PR #268 Fix cudf timestamp construction. +- PR #267 Fix branch-0.15 conda dev environment dependencies ## Bug Fixes - PR #244 Restrict gdal version. diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 4850c86b1..685f57709 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -20,6 +20,7 @@ CURRENT_PATCH=`echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}'` NEXT_MAJOR=$((CURRENT_MAJOR + 1)) NEXT_MINOR=$((CURRENT_MINOR + 1)) NEXT_PATCH=$((CURRENT_PATCH + 1)) +CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR} NEXT_FULL_TAG="" NEXT_SHORT_TAG="" @@ -51,3 +52,8 @@ sed_runner 's/'"CUDA_SPATIAL VERSION .* LANGUAGES"'/'"CUDA_SPATIAL VERSION ${NEX # RTD update sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py + +# bump cudf +for FILE in conda/environments/*.yml; do + sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" ${FILE}; +done diff --git a/conda/environments/cuspatial_dev_cuda10.0.yml b/conda/environments/cuspatial_dev_cuda10.0.yml index 330d3d097..9e7cef638 100644 --- a/conda/environments/cuspatial_dev_cuda10.0.yml +++ b/conda/environments/cuspatial_dev_cuda10.0.yml @@ -6,12 +6,9 @@ channels: - conda-forge - defaults dependencies: - - black=19.10 - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.14.* + - cudf=0.15.* - cudatoolkit=10.0 - - flake8=3.7.7 - gdal>=3.0.2 - geopandas=0.7.0 - - isort=5.0.4 diff --git a/conda/environments/cuspatial_dev_cuda10.1.yml b/conda/environments/cuspatial_dev_cuda10.1.yml index 5df51a917..ad4a18723 100644 --- a/conda/environments/cuspatial_dev_cuda10.1.yml +++ b/conda/environments/cuspatial_dev_cuda10.1.yml @@ -6,12 +6,9 @@ channels: - conda-forge - defaults dependencies: - - black=19.10 - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.14.* + - cudf=0.15.* - cudatoolkit=10.1 - - flake8=3.7.7 - gdal>=3.0.2 - geopandas=0.7.0 - - isort=5.0.4 diff --git a/conda/environments/cuspatial_dev_cuda10.2.yml b/conda/environments/cuspatial_dev_cuda10.2.yml index df90ce31c..3407c5384 100644 --- a/conda/environments/cuspatial_dev_cuda10.2.yml +++ b/conda/environments/cuspatial_dev_cuda10.2.yml @@ -6,12 +6,9 @@ channels: - conda-forge - defaults dependencies: - - black=19.10 - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.14.* + - cudf=0.15.* - cudatoolkit=10.2 - - flake8=3.7.7 - gdal>=3.0.2 - geopandas=0.7.0 - - isort=5.0.4 diff --git a/conda/environments/cuspatial_dev_cuda9.2.yml b/conda/environments/cuspatial_dev_cuda9.2.yml index e454d31ef..4c66c4310 100644 --- a/conda/environments/cuspatial_dev_cuda9.2.yml +++ b/conda/environments/cuspatial_dev_cuda9.2.yml @@ -6,12 +6,9 @@ channels: - conda-forge - defaults dependencies: - - black=19.10 - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.14.* + - cudf=0.15.* - cudatoolkit=9.2 - - flake8=3.7.7 - gdal>=3.0.2 - geopandas=0.7.0 - - isort=5.0.4