[RELEASE] integration v21.08

ci/axis/nightly.yaml

@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
 RAPIDS_VER:
-  - 21.06.00a
+  - 21.08.00a
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.4
   - 11.2
   - 11.0
 

ci/axis/release.yaml

@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Y (major.minor.patch) version to match tag
 RAPIDS_VER:
-  - "21.06.01"
+  - "21.08.00"
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.4
   - 11.2
   - 11.0
 

ci/axis/tests.yaml

@@ -6,14 +6,13 @@ DOCKER_REPO:
 
 # Use M.X (major.minor) version
 RAPIDS_VER:
-  - '21.06'
+  - "21.08"
 
 CUDA_VER:
   - 11.2
   - 11.0
 
 LINUX_VER:
-  - ubuntu16.04
   - ubuntu18.04
   - ubuntu20.04
   - centos7

ci/release/update-version.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+###############################
+# Integration Version Updater #
+###############################
+
+## Usage
+# bash update-version.sh <new_version>
+
+
+# Format is YY.MM.PP - no leading 'v' or trailing 'a'
+NEXT_FULL_TAG=$1
+
+# Get current version
+CURRENT_TAG=$(git tag --merged HEAD | grep -xE '^v.*' | sort --version-sort | tail -n 1 | tr -d 'v')
+CURRENT_MAJOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[1]}')
+CURRENT_MINOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[2]}')
+CURRENT_PATCH=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}' | tr -d 'a')
+CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
+
+#Get <major>.<minor> for next version
+NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
+NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
+NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
+
+echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
+
+# Inplace sed replace; workaround for Linux and Mac
+function sed_runner() {
+    sed -i.bak ''"$1"'' $2 && rm -f ${2}.bak
+}
+
+# Axis file update
+sed_runner "/RAPIDS_VER/a \ \ \- ${NEXT_FULL_TAG}a" ci/axis/nightly.yaml
+sed_runner "/RAPIDS_VER/a \ \ \- \"${NEXT_FULL_TAG}\"" ci/axis/release.yaml
+sed_runner "/RAPIDS_VER/a \ \ \- \"${NEXT_SHORT_TAG}\"" ci/axis/tests.yaml

conda/recipes/rapids-build-env/meta.yaml

@@ -47,8 +47,8 @@ requirements:
     - boost-cpp {{ boost_cpp_version }}
     - boto3
     - cachetools
-    - conda-forge::clang {{ clang_version }}
-    - conda-forge::clang-tools {{ clang_version }}
+    - conda-forge::clang {{ clang_version }} # [x86_64]
+    - conda-forge::clang-tools {{ clang_version }} # [x86_64]
     - cmake {{ cmake_version }}
     - cmake-format {{ cmake_format_version }}
     - cmake_setuptools {{ cmake_setuptools_version }}
@@ -69,7 +69,6 @@ requirements:
     - fastavro {{ fastavro_version }}
     - feather-format
     - flake8 {{ flake8_version }}
-    - flatbuffers {{ flatbuffers_version }}
     - fsspec {{ fsspec_version }}
     - gcsfs {{ gcsfs_version }}
     - gdal {{ gdal_version }}
@@ -94,7 +93,7 @@ requirements:
     - libwebp
     - lightgbm
     - make
-    - mimesis
+    - mimesis {{ mimesis_version }}
     - moto {{ moto_version }}
     - mypy {{ mypy_version }}
     - nccl {{ nccl_version }}

conda/recipes/rapids-doc-env/meta.yaml

@@ -36,6 +36,7 @@ requirements:
   run:
     - beautifulsoup4
     - doxygen {{ doxygen_version }}
+    - html5lib
     - jupyter_sphinx
     - markdown
     - nbsphinx {{ nbsphinx_version }}

conda/recipes/rapids/meta.yaml

@@ -48,7 +48,7 @@ requirements:
     - cudf ={{ minor_version }}.*
     - cugraph ={{ minor_version }}.*
     - cuml ={{ minor_version }}.*
-    # - cucim ={{ minor_version }}.*
+    - cucim ={{ minor_version }}.*
     - cusignal ={{ minor_version }}.*
     - cuspatial ={{ minor_version }}.*
     - custreamz ={{ minor_version }}.*

conda/recipes/versions.yaml

@@ -13,7 +13,7 @@ xgboost_version:
 
 # Versions for conda
 conda_version:
-  - '=4.8.3'
+  - '=4.10.3'
 conda_build_version:
   - '=3.20.3'
 conda_verify_version:
@@ -25,17 +25,17 @@ build_stack_version:
 
 # Shared versions across meta-pkgs
 arrow_version:
-  - '=1.0.1'
+  - '=4.0.1'
 benchmark_version:
   - '=1.5.1'
 black_version:
   - '=19.10'
 bokeh_version:
-  - '>=2.1.1,<=2.2.3'
+  - '>=2.3.2,<2.4'
 boost_cpp_version:
   - '=1.72.0'
 clang_version:
-  - '=8.0.1'
+  - '=11.0.0'
 cmake_version:
   - '>=3.20.1,<3.21'
 cmake_format_version:
@@ -47,11 +47,11 @@ cupy_version:
 cython_version:
   - '>=0.29.17,<0.30'
 dask_version:
-  - '>=2021.4.0,<=2021.5.1'
+  - '>=2021.6.0,<=2021.07.1'
 datashader_version:
   - '>=0.11.1,<0.12'
 distributed_version:
-  - '>=2.23.0,<=2021.5.1'
+  - '>=2021.6.0,<=2021.07.1'
 dlpack_version:
   - '>=0.5,<0.6.0a0'
 double_conversion_version:
@@ -64,8 +64,6 @@ fastavro_version:
   - '>=0.22.0'
 flake8_version:
   - '=3.8'
-flatbuffers_version:
-  - '=1.10.0'
 fsspec_version:
   - '>=0.9.0'
 gdal_version:
@@ -75,21 +73,23 @@ geopandas_version:
 gcsfs_version:
   - '>=0.8.0'
 google_cloud_cpp_version:
-  - '=1.25.0'
+  - '>=1.25.0'
 gmock_version:
   - '=1.10.0'
 gtest_version:
   - '=1.10.0'
 ipython_version:
   - '=7.15'
 isort_version:
-  - '=5.0'
+  - '=5.6.4'
 jupyterlab_version:
   - '>=3.0.0,<4.0a0'
 jupyter_packaging_version:
   - '>=0.7.0,<0.8'
 librdkafka_version:
-  - '=1.5.*'
+  - '=1.6.*'
+mimesis_version:
+  - '<4.1'
 moto_version:
   - '>=1.3.14'
 mypy_version:
@@ -131,7 +131,7 @@ pytorch_version:
 protobuf_version:
   - '>=3.4.1,<4.0.0'
 pyproj_version:
-  - '>=2.4,<=3.0.1'
+  - '>=2.4,<=3.1'
 pyppeteer_version:
   - '<=0.2.2'
 pytest_asyncio_version:
@@ -149,8 +149,8 @@ scipy_version:
 setuptools_version:
   - '>=49,<50'
 spdlog_version:
-  - '>=1.8.5,<2.0.0a0'
+  - '>=1.8.5,<1.9'
 sphinx_markdown_tables_version:
   - '=0.0.14=pyh9f0ad1d_1'
 treelite_version:
-  - '=1.3.0'
+  - '=2.0.0'

test/dask-cudf/test_daskcudf.py

@@ -1,7 +1,7 @@
 import pytest
 import subprocess
 
-from cudf.tests.utils import assert_eq
+from cudf.testing._utils import assert_eq
 
 __numGPUSkipReason = ""