From 92c85cb698e47195452712346896dd83103cbc02 Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Mon, 29 Nov 2021 14:18:46 -0800 Subject: [PATCH 01/10] updated yaml files to remove 3.7 and include 3.9 --- ci/axis/nightly-arm64.yaml | 2 +- ci/axis/nightly.yaml | 2 +- ci/axis/release-arm64.yaml | 2 +- ci/axis/release.yaml | 2 +- ci/axis/tests.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml index 7539cf0e..8115998b 100644 --- a/ci/axis/nightly-arm64.yaml +++ b/ci/axis/nightly-arm64.yaml @@ -15,7 +15,7 @@ CUDA_VER: - 11.2 PYTHON_VER: - - 3.7 + - 3.9 - 3.8 exclude: diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index eb8daccf..82149129 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -16,7 +16,7 @@ CUDA_VER: - 11.0 PYTHON_VER: - - 3.7 + - 3.9 - 3.8 exclude: diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 11290c47..46033d81 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -15,7 +15,7 @@ CUDA_VER: - 11.2 PYTHON_VER: - - 3.7 + - 3.9 - 3.8 exclude: diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index a7eb192d..7f659e12 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -16,7 +16,7 @@ CUDA_VER: - 11.0 PYTHON_VER: - - 3.7 + - 3.9 - 3.8 exclude: diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index d44fe810..173ed212 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -21,6 +21,6 @@ LINUX_VER: - centos8 PYTHON_VER: - - 3.7 + - 3.9 exclude: From e392f8448f77797a4073c2f55e42dd86c4c6b11a Mon Sep 17 00:00:00 2001 From: Mark Sadang <63854412+msadang@users.noreply.github.com> Date: Tue, 30 Nov 2021 12:11:28 -0800 Subject: [PATCH 02/10] Update ci/axis/tests.yaml Co-authored-by: AJ Schmidt --- ci/axis/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 173ed212..9b01c8d4 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -21,6 +21,6 @@ LINUX_VER: - centos8 PYTHON_VER: - - 3.9 + - 3.8 exclude: From cd7946af548995e16b231c0b6a6f3fa251ae5b50 Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Mon, 6 Dec 2021 11:57:15 -0800 Subject: [PATCH 03/10] change python version order --- ci/axis/nightly-arm64.yaml | 2 +- ci/axis/nightly.yaml | 2 +- ci/axis/release-arm64.yaml | 2 +- ci/axis/release.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml index 8115998b..5fda3866 100644 --- a/ci/axis/nightly-arm64.yaml +++ b/ci/axis/nightly-arm64.yaml @@ -15,7 +15,7 @@ CUDA_VER: - 11.2 PYTHON_VER: - - 3.9 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml index 82149129..5953a08d 100644 --- a/ci/axis/nightly.yaml +++ b/ci/axis/nightly.yaml @@ -16,7 +16,7 @@ CUDA_VER: - 11.0 PYTHON_VER: - - 3.9 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 46033d81..b2edd92c 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -15,7 +15,7 @@ CUDA_VER: - 11.2 PYTHON_VER: - - 3.9 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 7f659e12..f33b3e91 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -16,7 +16,7 @@ CUDA_VER: - 11.0 PYTHON_VER: - - 3.9 - 3.8 + - 3.9 exclude: From d536394b609c69331a8af598ccd4514d0c644c45 Mon Sep 17 00:00:00 2001 From: Mark Sadang <63854412+msadang@users.noreply.github.com> Date: Wed, 5 Jan 2022 13:13:55 -0800 Subject: [PATCH 04/10] Update conda build version Update conda build to ver 3.21.7 to accomodate python 3.9 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 10f66d19..f5fb7b24 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -15,7 +15,7 @@ xgboost_version: conda_version: - '=4.10.3' conda_build_version: - - '=3.20.3' + - '=3.21.7' conda_verify_version: - '=3.1.1' From adfcd823e488c22b9577048a98b6e6ae9c6d9b20 Mon Sep 17 00:00:00 2001 From: Mark Sadang <63854412+msadang@users.noreply.github.com> Date: Mon, 10 Jan 2022 12:57:43 -0800 Subject: [PATCH 05/10] remove fa2 package fa2 deprecated, no longer being maintained --- conda/recipes/rapids-notebook-env/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 5818d376..aca93227 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -44,7 +44,6 @@ requirements: - dask-labextension - dask-ml - datashader {{ datashader_version }} - - fa2 - filterpy - holoviews - ipython {{ ipython_version }} From 1ed8fcd9948f13c615b52509bff7957a9836efad Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Mon, 10 Jan 2022 13:00:01 -0800 Subject: [PATCH 06/10] add python 3.0 to tests --- ci/axis/tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 6ac4a61a..cbd11192 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -22,5 +22,6 @@ LINUX_VER: PYTHON_VER: - 3.8 + - 3.9 exclude: From c1fbcf293df92ddfc8fcd8b93e1124f827405693 Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Tue, 11 Jan 2022 09:36:47 -0800 Subject: [PATCH 07/10] update ipython to py39 compatible version --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index f5fb7b24..1c4e226a 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -81,7 +81,7 @@ gmock_version: gtest_version: - '=1.10.0' ipython_version: - - '=7.15' + - '=7.31.0' isort_version: - '=5.6.4' jupyterlab_version: From 2eb88172d1410f98b3053ad727f3f7b6e0dd5391 Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Tue, 11 Jan 2022 09:59:08 -0800 Subject: [PATCH 08/10] Fix upstream conflicts --- ci/axis/nightly-arm64.yaml | 21 --------------------- ci/axis/nightly.yaml | 22 ---------------------- 2 files changed, 43 deletions(-) delete mode 100644 ci/axis/nightly-arm64.yaml delete mode 100644 ci/axis/nightly.yaml diff --git a/ci/axis/nightly-arm64.yaml b/ci/axis/nightly-arm64.yaml deleted file mode 100644 index 436b0ead..00000000 --- a/ci/axis/nightly-arm64.yaml +++ /dev/null @@ -1,21 +0,0 @@ -CONDA_USERNAME: - - rapidsai-nightly - -CONDA_CONFIG_FILE: - - conda/recipes/versions.yaml - -# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag -RAPIDS_VER: - - 22.02.00a - -# Use CUDA_VER to not clobber `CUDA_VERSION` in the container -CUDA_VER: - - 11.5 - - 11.4 - - 11.2 - -PYTHON_VER: - - 3.8 - - 3.9 - -exclude: diff --git a/ci/axis/nightly.yaml b/ci/axis/nightly.yaml deleted file mode 100644 index 2720fbd5..00000000 --- a/ci/axis/nightly.yaml +++ /dev/null @@ -1,22 +0,0 @@ -CONDA_USERNAME: - - rapidsai-nightly - -CONDA_CONFIG_FILE: - - conda/recipes/versions.yaml - -# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag -RAPIDS_VER: - - 22.02.00a - -# Use CUDA_VER to not clobber `CUDA_VERSION` in the container -CUDA_VER: - - 11.5 - - 11.4 - - 11.2 - - 11.0 - -PYTHON_VER: - - 3.8 - - 3.9 - -exclude: From d6eda8288d72c01af4d87c3d53062e2c62fee445 Mon Sep 17 00:00:00 2001 From: Mark Sadang Date: Tue, 11 Jan 2022 10:00:40 -0800 Subject: [PATCH 09/10] add py39 to nightly yaml --- ci/axis/nightly-env-arm64.yaml | 2 +- ci/axis/nightly-env.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/axis/nightly-env-arm64.yaml b/ci/axis/nightly-env-arm64.yaml index 650b89dc..436b0ead 100644 --- a/ci/axis/nightly-env-arm64.yaml +++ b/ci/axis/nightly-env-arm64.yaml @@ -15,7 +15,7 @@ CUDA_VER: - 11.2 PYTHON_VER: - - 3.7 - 3.8 + - 3.9 exclude: diff --git a/ci/axis/nightly-env.yaml b/ci/axis/nightly-env.yaml index 2caefd22..2720fbd5 100644 --- a/ci/axis/nightly-env.yaml +++ b/ci/axis/nightly-env.yaml @@ -16,7 +16,7 @@ CUDA_VER: - 11.0 PYTHON_VER: - - 3.7 - 3.8 + - 3.9 exclude: From 4ffa1e13686c6f1b3c0c77f62194319136173451 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Tue, 18 Jan 2022 17:23:37 +0100 Subject: [PATCH 10/10] Update axis files for python 3.9 Signed-off-by: Jordan Jacobelli --- ci/axis/nightly-env-arm64.yaml | 1 + ci/axis/nightly-env.yaml | 1 + ci/axis/release-arm64.yaml | 2 +- ci/axis/release.yaml | 2 +- ci/axis/tests.yaml | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/axis/nightly-env-arm64.yaml b/ci/axis/nightly-env-arm64.yaml index 0dfae40c..b0996feb 100644 --- a/ci/axis/nightly-env-arm64.yaml +++ b/ci/axis/nightly-env-arm64.yaml @@ -13,6 +13,7 @@ CUDA_VER: - 11.5 PYTHON_VER: + - 3.7 - 3.8 - 3.9 diff --git a/ci/axis/nightly-env.yaml b/ci/axis/nightly-env.yaml index 0dfae40c..b0996feb 100644 --- a/ci/axis/nightly-env.yaml +++ b/ci/axis/nightly-env.yaml @@ -13,6 +13,7 @@ CUDA_VER: - 11.5 PYTHON_VER: + - 3.7 - 3.8 - 3.9 diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 7ef29118..26bbf7f8 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -13,7 +13,7 @@ CUDA_VER: - 11.5 PYTHON_VER: + - 3.7 - 3.8 - - 3.9 exclude: diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 7ef29118..26bbf7f8 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -13,7 +13,7 @@ CUDA_VER: - 11.5 PYTHON_VER: + - 3.7 - 3.8 - - 3.9 exclude: diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index e2a8fa2d..6b5600eb 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -18,7 +18,7 @@ LINUX_VER: - centos8 PYTHON_VER: + - 3.7 - 3.8 - - 3.9 exclude: