Merge branch 'branch-21.12' into update_xgboost1.5.0

rapidsai · Nov 4, 2021 · 453e19b · 453e19b
2 parents 03fef10 + 4a92736
commit 453e19b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml
@@ -10,6 +10,7 @@ RAPIDS_VER:
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
 

diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml
@@ -10,6 +10,7 @@ RAPIDS_VER:
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
   - 11.0

diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml
@@ -6,10 +6,11 @@ CONDA_CONFIG_FILE:
 
 # Use M.X.Y (major.minor.patch) version to match tag
 RAPIDS_VER:
-  - "21.10.00"
+  - "21.12.00"
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
 

diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml
@@ -10,6 +10,7 @@ RAPIDS_VER:
 
 # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
   - 11.0

diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml
@@ -9,6 +9,7 @@ RAPIDS_VER:
   - "21.12"
 
 CUDA_VER:
+  - 11.5
   - 11.4
   - 11.2
   - 11.0

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -30,6 +30,8 @@ function sed_runner() {
 }
 
 # 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
+sed_runner "/RAPIDS_VER/{n; s/- .*/- ${NEXT_FULL_TAG}a/}" ci/axis/nightly.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- ${NEXT_FULL_TAG}a/}" ci/axis/nightly-arm64.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- \"${NEXT_FULL_TAG}\"/}" ci/axis/release.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- \"${NEXT_FULL_TAG}\"/}" ci/axis/release-arm64.yaml
+sed_runner "/RAPIDS_VER/{n; s/- .*/- \"${NEXT_SHORT_TAG}\"/}" ci/axis/tests.yaml
diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml
@@ -141,15 +141,15 @@ pytest_asyncio_version:
 rapidjson_version:
   - '=1.1.0'
 s3fs_version:
-  - '>=0.5.2'
+  - '>=2021.08.0'
 scikit_image_version:
   - '>=0.18.0,<0.19.0'
 scikit_learn_version:
   - '=0.24'
 scipy_version:
   - '=1.6.0'
 setuptools_version:
-  - '>=49,<50'
+  - '>50'
 spdlog_version:
   - '>=1.8.5,<1.9'
 sphinx_markdown_tables_version:
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ RAPIDS_VER: @@
     # Use CUDA_VER to not clobber `CUDA_VERSION` in the container
     CUDA_VER:
+      - 11.5
       - 11.4
       - 11.2
@@ Expand Down @@