Merge branch 'main' of github.com:rapidsai/legateboost into ensemble

VERSION

@@ -1 +1 @@
-24.06.01
+24.09.00

ci/build_docs.sh

@@ -6,8 +6,6 @@ set -e -E -u -o pipefail
 # shellcheck disable=SC1091
 . /opt/conda/etc/profile.d/conda.sh
 
-LEGATEBOOST_VERSION=$(rapids-version)
-
 rapids-print-env
 
 rapids-dependency-file-generator \
@@ -31,11 +29,12 @@ rapids-print-env
 # Install legate-boost conda package built in the previous CI job
 rapids-mamba-retry install \
   --name docs-env \
+  --override-channels \
   --channel "${RAPIDS_LOCAL_CONDA_CHANNEL}" \
   --channel legate \
   --channel legate/label/experimental \
   --channel conda-forge \
-  "legate-boost=${LEGATEBOOST_VERSION}"
+  "legate-boost=*=*_cpu*"
 
 rapids-print-env
 

conda/recipes/legate-boost/meta.yaml

@@ -14,7 +14,6 @@
 #  '*_gpu' for systems with CUDA
 #
 # this mirrors the approach used by cunumeric / legate
-# (though as of 24.06, they do not append a '*_gpu' to the build string for GPU packages)
 {% if gpu_enabled == "true" %}
   {% set gpu_enabled_bool = true %}
 {% elif gpu_enabled == "false" %}
@@ -80,12 +79,12 @@ requirements:
     {% if gpu_enabled_bool %}
     - cuda-version ={{ cuda_version }}
     - cuda-cudart-dev
-    - cunumeric {{ legate_version }} =*_gpu
-    - legate {{ legate_version }} =*_gpu
+    - cunumeric {{ legate_version }} =*_gpu*
+    - legate {{ legate_version }} =*_gpu*
     - libcublas-dev
     {% else %}
-    - cunumeric {{ legate_version }} =*_cpu
-    - legate {{ legate_version }} =*_cpu
+    - cunumeric {{ legate_version }} =*_cpu*
+    - legate {{ legate_version }} =*_cpu*
     {% endif %}
     - openblas
     - python
@@ -100,9 +99,9 @@ requirements:
     # cuda-version is used to constrain __cuda
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     - __cuda
-    - cunumeric {{ legate_version }} =*_gpu
+    - cunumeric {{ legate_version }} =*_gpu*
     {% else %}
-    - cunumeric {{ legate_version }} =*_cpu
+    - cunumeric {{ legate_version }} =*_cpu*
     {% endif %}
     # Relying on run_exports from legate to pin an appropriate range of versions and
     # GPU vs. CPU selector.

contributing.md

@@ -197,14 +197,9 @@ NOTE: some steps in this section require direct write access to the repo (includ
 
 ### Create a stable release
 
-1. Create a pull request updating the `VERSION` file on the `main` branch to the desired version, with no leading `v`
+NOTE: this assumes that the `VERSION` file on the `main` branch already holds the 3-part version number like `24.09.00`.
 
-```shell
-echo "24.09.00" > ./VERSION
-```
-
-2. Merge that pull request
-3. Push a git tag like `v24.09.00` ... that tag push will trigger a new release
+1. Push a git tag like `v24.09.00` ... that tag push will trigger a new release
 
 ```shell
 git checkout main
@@ -213,19 +208,21 @@ git tag -a v24.09.00 -m 'v24.09.00'
 git push upstream 'v24.09.00'
 ```
 
-4. Update the `VERSION` file again, to the base version for the anticipated next release. Push this directly to `main`, with a commit that includes `[skip ci]` in the message so new packages will not be built from it.
+2. Update the `VERSION` file again, to the base version for the anticipated next release (without a leading `v`). Open a pull request with that change. Ensure the pull request title ends with `[skip ci]`.
 
 ```shell
-git checkout main
-git pull upstream main
+git checkout -b update-version
 echo "24.12.00" > ./VERSION
-git commit -m "start v24.12 development [skip ci]"
-git push upstream main
+git commit -m "start v24.12 development"
+git push origin update-version
 ```
 
-5. Tag that commit with a dev version
+3. Merge the pull request.
+4. Tag that commit with a dev version
 
 ```shell
+git checkout main
+git pull upstream main
 git tag -a v24.12.00dev -m "v24.12.00dev"
 git push upstream v24.12.00dev
 ```