Skip to content

Commit

Permalink
Make versions PEP440 compliant (#1279)
Browse files Browse the repository at this point in the history
I believe this is what is causing issues for downstream package resolution (24.02 != 24.2) e.g. in rapidsai/cudf#14426.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: #1279
  • Loading branch information
vyasr authored Nov 16, 2023
1 parent 6dd83ed commit 297ad67
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
9 changes: 5 additions & 4 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
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}
NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
NEXT_UCXPY_VERSION="$(curl -s https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})"

echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
Expand All @@ -35,12 +36,12 @@ function sed_runner() {
echo "${NEXT_FULL_TAG}" | tr -d '"' > VERSION

# Bump cudf and dask-cudf testing dependencies
sed_runner "s/cudf==.*/cudf==${NEXT_SHORT_TAG}.*/g" dependencies.yaml
sed_runner "s/dask-cudf==.*/dask-cudf==${NEXT_SHORT_TAG}.*/g" dependencies.yaml
sed_runner "s/kvikio==.*/kvikio==${NEXT_SHORT_TAG}.*/g" dependencies.yaml
sed_runner "s/cudf==.*/cudf==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml
sed_runner "s/dask-cudf==.*/dask-cudf==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml
sed_runner "s/kvikio==.*/kvikio==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml
sed_runner "s/ucx-py==.*/ucx-py==${NEXT_UCXPY_VERSION}.*/g" dependencies.yaml
sed_runner "s/ucxx==.*/ucxx==${NEXT_UCXPY_VERSION}.*/g" dependencies.yaml
sed_runner "s/rapids-dask-dependency==.*/rapids-dask-dependency==${NEXT_SHORT_TAG}.*/g" dependencies.yaml
sed_runner "s/rapids-dask-dependency==.*/rapids-dask-dependency==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml

# CI files
for FILE in .github/workflows/*.yaml; do
Expand Down
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ dependencies:
- numpy>=1.21
- pandas>=1.3,<1.6.0dev0
- pynvml>=11.0.0,<11.5
- rapids-dask-dependency==24.02.*
- rapids-dask-dependency==24.2.*
- zict>=2.0.0
test_python:
common:
- output_types: [conda, requirements, pyproject]
packages:
- cudf==24.02.*
- dask-cudf==24.02.*
- kvikio==24.02.*
- cudf==24.2.*
- dask-cudf==24.2.*
- kvikio==24.2.*
- pytest
- pytest-cov
- ucx-py==0.36.*
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies = [
"numpy>=1.21",
"pandas>=1.3,<1.6.0dev0",
"pynvml>=11.0.0,<11.5",
"rapids-dask-dependency==24.02.*",
"rapids-dask-dependency==24.2.*",
"zict>=2.0.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down Expand Up @@ -48,9 +48,9 @@ docs = [
"sphinx-rtd-theme>=0.5.1",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
test = [
"cudf==24.02.*",
"dask-cudf==24.02.*",
"kvikio==24.02.*",
"cudf==24.2.*",
"dask-cudf==24.2.*",
"kvikio==24.2.*",
"pytest",
"pytest-cov",
"ucx-py==0.36.*",
Expand Down

0 comments on commit 297ad67

Please sign in to comment.