Skip to content

Commit

Permalink
Merge pull request #349 from jakirkham/branch-24.04-merge-24.02
Browse files Browse the repository at this point in the history
Forward-merge `branch-24.02` into `branch-24.04` [skip ci]
  • Loading branch information
AyodeAwe authored Feb 26, 2024
2 parents a695d6c + aa3b029 commit 5337e73
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 21 deletions.
9 changes: 0 additions & 9 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@ sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '${NEXT_FULL_
sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py
sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py

DEPENDENCIES=(
cudf
)
for DEP in "${DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}"
done
done

# CI files
for FILE in .github/workflows/*.yaml; do
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
Expand Down
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- cuda-python>=11.7.1,<12.0a0
- cuda-version=11.8
- cudatoolkit
- cudf==24.4.*
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
Expand All @@ -26,7 +25,7 @@ dependencies:
- numpy>=1.21
- numpydoc
- nvcc_linux-64=11.8
- nvcomp==3.0.5
- nvcomp==3.0.6
- packaging
- pre-commit
- pytest
Expand Down
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- cuda-nvcc
- cuda-python>=12.0,<13.0a0
- cuda-version=12.2
- cudf==24.4.*
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
Expand All @@ -24,7 +23,7 @@ dependencies:
- numcodecs <0.12.0
- numpy>=1.21
- numpydoc
- nvcomp==3.0.5
- nvcomp==3.0.6
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/kvikio/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ cmake_version:
- ">=3.26.4"

nvcomp_version:
- "=3.0.5"
- "=3.0.6"
8 changes: 1 addition & 7 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ files:
- cuda_version
- depends_on_cupy
- docs
- notebooks
- py_version
- run
- test_python
Expand Down Expand Up @@ -180,7 +179,7 @@ dependencies:
common:
- output_types: conda
packages:
- nvcomp==3.0.5
- nvcomp==3.0.6
specific:
- output_types: conda
matrices:
Expand Down Expand Up @@ -300,8 +299,3 @@ dependencies:
packages:
- *dask
- distributed>=2022.05.2
notebooks:
common:
- output_types: conda
packages:
- cudf==24.4.*

0 comments on commit 5337e73

Please sign in to comment.