Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
263192c
Upgrade `arrow` to `6.0.1`
galipremsagar Jan 12, 2022
bfcd4e4
DOC
raydouglass Jan 13, 2022
55774e3
Update conda/recipes/versions.yaml
galipremsagar Jan 13, 2022
1def6f7
Merge branch 'rapidsai:branch-22.02' into patch-31
galipremsagar Jan 13, 2022
17c1c33
Update versions.yaml
galipremsagar Jan 13, 2022
534712a
Merge branch 'branch-22.02' into patch-31
ajschmidt8 Jan 18, 2022
24d5135
Merge pull request #416 from rapidsai/branch-22.02
GPUtester Jan 19, 2022
3f74391
Merge branch 'rapidsai:branch-22.02' into patch-31
galipremsagar Jan 20, 2022
0c07c88
Merge pull request #419 from rapidsai/branch-22.02
GPUtester Jan 24, 2022
06cd3cc
Merge branch 'rapidsai:branch-22.02' into patch-31
galipremsagar Jan 24, 2022
a054a22
Merge pull request #420 from rapidsai/branch-22.02
GPUtester Jan 24, 2022
d340815
Merge remote-tracking branch 'upstream/branch-22.04' into HEAD
galipremsagar Jan 25, 2022
62ad1a5
Merge pull request #421 from rapidsai/branch-22.02
GPUtester Jan 26, 2022
1db237c
Merge pull request #424 from rapidsai/branch-22.02
GPUtester Jan 28, 2022
dd0befa
Merge branch 'branch-22.04' into patch-31
galipremsagar Jan 31, 2022
da9e1f7
unpin max dask & distributed versions
galipremsagar Feb 1, 2022
d78eb7e
Merge pull request #427 from rapidsai/branch-22.02
GPUtester Feb 3, 2022
8ab01ea
Merge pull request #429 from rapidsai/branch-22.02
GPUtester Feb 3, 2022
93f3472
Merge branch 'branch-22.04' into patch-33
ajschmidt8 Feb 4, 2022
c5aa6c3
Merge branch 'rapidsai:branch-22.04' into patch-31
galipremsagar Feb 4, 2022
27c86c4
Merge pull request #432 from rapidsai/branch-22.02
GPUtester Feb 7, 2022
5c07e7c
Merge branch 'rapidsai:branch-22.04' into patch-31
galipremsagar Feb 7, 2022
07af585
Use mambabuild
jjacobelli Feb 7, 2022
4317ed7
Update meta.yaml
galipremsagar Feb 7, 2022
d1ccc7c
Update versions.yaml
galipremsagar Feb 7, 2022
23af886
Apply suggestions from code review
galipremsagar Feb 7, 2022
41b0587
Apply suggestions from code review
galipremsagar Feb 7, 2022
9313789
Apply suggestions from code review
galipremsagar Feb 7, 2022
23a2f16
Apply suggestions from code review
galipremsagar Feb 7, 2022
cf4bc5a
Update build.sh
galipremsagar Feb 7, 2022
1127216
Apply suggestions from code review
galipremsagar Feb 7, 2022
a3ef7fb
Update build.sh
galipremsagar Feb 8, 2022
415c569
Apply suggestions from code review
galipremsagar Feb 8, 2022
7097c68
Update conda/recipes/versions.yaml
galipremsagar Feb 8, 2022
d623abb
Merge pull request #410 from galipremsagar/patch-31
ajschmidt8 Feb 8, 2022
d772bc6
Merge branch 'branch-22.04' into patch-33
ajschmidt8 Feb 10, 2022
c7dd61a
Merge pull request #425 from galipremsagar/patch-33
ajschmidt8 Feb 10, 2022
5e75f05
Add scikit-build.
vyasr Feb 11, 2022
76071bf
Merge pull request #434 from vyasr/feature/add_skbuild
ajschmidt8 Feb 14, 2022
4da03ca
Drop Python 3.7 requirements
jakirkham Feb 18, 2022
ee49302
Upgrade to Treelite 2.3.0
chyunsu3 Feb 19, 2022
887942b
Merge pull request #435 from jakirkham/drop_py37_deps
jjacobelli Feb 19, 2022
177306d
Merge branch 'branch-22.04' into upgrade_treelite
jjacobelli Feb 19, 2022
0d743b1
Merge pull request #436 from hcho3/upgrade_treelite
ajschmidt8 Feb 22, 2022
f469cd3
Remove libhwloc
pentschev Feb 22, 2022
2fa52da
Merge pull request #437 from pentschev/remove-libhwloc
ajschmidt8 Feb 24, 2022
9d4e0ce
Update `dask` & `distributed` minimum versions
ajschmidt8 Mar 7, 2022
0b02573
Merge pull request #438 from ajschmidt8/update-dask
ajschmidt8 Mar 7, 2022
1935388
Modify networkx version requirements
betochimas Mar 8, 2022
4e943c4
Merge pull request #439 from betochimas/patch-1
ajschmidt8 Mar 8, 2022
7c15cbe
add h5py dependency
rg20 Mar 11, 2022
b1deb45
Merge pull request #440 from rg20/h5py_dependency
ajschmidt8 Mar 14, 2022
c3dafda
Update axis for `22.06`
ajschmidt8 Mar 22, 2022
cfde3de
Update minimum `dask`/`distributed` versions
ajschmidt8 Mar 22, 2022
e05db8a
update pins
ajschmidt8 Mar 22, 2022
3e1d19e
fix version pin syntax
ajschmidt8 Mar 22, 2022
9ec6a7c
Update `bokeh` version
ajschmidt8 Mar 22, 2022
6d7d723
Merge pull request #444 from ajschmidt8/update-bokeh
ajschmidt8 Mar 22, 2022
296a469
Merge branch 'branch-22.04' into 22.06-env-pkgs
ajschmidt8 Mar 22, 2022
03dc212
Merge pull request #442 from ajschmidt8/22.06-env-pkgs
ajschmidt8 Mar 22, 2022
ab1ea04
Merge branch 'branch-22.04' into update-dask
ajschmidt8 Mar 22, 2022
b7b4d2a
Merge pull request #443 from ajschmidt8/update-dask
ajschmidt8 Mar 22, 2022
09f9745
Revert "Update axis for `22.06`"
ajschmidt8 Mar 22, 2022
b01cb3b
Merge pull request #448 from ajschmidt8/fix-axis
ajschmidt8 Mar 22, 2022
e51a534
Pin click version to last supported by black 22.1.0.
vyasr Mar 29, 2022
e05b22a
Merge pull request #453 from vyasr/pin_click
jjacobelli Mar 30, 2022
fbce689
update panel pins, and add jinja2
AjayThorve Mar 30, 2022
4a7ae4b
set minimum panel version to 0.12.7
AjayThorve Mar 30, 2022
64b7afc
Merge pull request #454 from AjayThorve/update/panel-jinja2
ajschmidt8 Mar 30, 2022
9ce85e4
Add `dask`/`distributed` version specs to `rapids-notebook-env`
ajschmidt8 Mar 31, 2022
256c705
Merge pull request #459 from ajschmidt8/fix-dask-notebook-env
ajschmidt8 Mar 31, 2022
78cb270
update datashader version
AjayThorve Apr 1, 2022
5d1fba5
Merge pull request #462 from AjayThorve/fix/datashader-version
ajschmidt8 Apr 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/axis/nightly-env-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
RAPIDS_VER:
- 22.02.00a
- 22.04.00a

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/nightly-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
RAPIDS_VER:
- 22.02.00a
- 22.04.00a

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/nightly-meta-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
RAPIDS_VER:
- 22.02.00a
- 22.04.00a

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/nightly-meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag
RAPIDS_VER:
- 22.02.00a
- 22.04.00a

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/release-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Y (major.minor.patch) version to match tag
RAPIDS_VER:
- "22.02.00"
- "22.04.00"

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE:

# Use M.X.Y (major.minor.patch) version to match tag
RAPIDS_VER:
- "22.02.00"
- "22.04.00"

# Use CUDA_VER to not clobber `CUDA_VERSION` in the container
CUDA_VER:
Expand Down
2 changes: 1 addition & 1 deletion ci/axis/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DOCKER_REPO:

# Use M.X (major.minor) version
RAPIDS_VER:
- "22.02"
- "22.04"

CUDA_VER:
- 11.5
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/rapids-build-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ requirements:
- automake
- benchmark {{ benchmark_version }}
- black {{ black_version }}
- click =8.0.4 # Required for black < 22.3.0, see https://github.com/psf/black/issues/2964
- conda-forge::blas
- boost
- boost-cpp {{ boost_cpp_version }}
Expand Down Expand Up @@ -79,6 +80,7 @@ requirements:
- gmock {{ gmock_version }}
- graphviz
- gtest {{ gtest_version }}
- h5py
- hdbscan
- holoviews {{ holoviews_version }}
- httpretty
Expand All @@ -88,7 +90,6 @@ requirements:
- libcypher-parser
- libgcc-ng {{ build_stack_version }}
- libgfortran-ng {{ build_stack_version }}
- libhwloc
- liblapack
- librdkafka {{ librdkafka_version }}
- libstdcxx-ng {{ build_stack_version }}
Expand All @@ -111,7 +112,6 @@ requirements:
- packaging
- pandas {{ pandas_version }}
- panel {{ panel_version }}
- pickle5 # [py<38]
- pillow {{ pillow_version }}
- pkg-config
- pre-commit
Expand Down Expand Up @@ -139,6 +139,7 @@ requirements:
- ripgrep
- s3fs {{ s3fs_version }}
- setuptools
- scikit-build {{ scikit_build_version }}
- scikit-image {{ scikit_image_version }}
- scikit-learn {{ scikit_learn_version }}
- scipy {{ scipy_version }}
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/rapids-notebook-env/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ requirements:
- cudatoolkit ={{ cuda_major }}.*
- cupy {{ cupy_version }}
- cython {{ cython_version }}
- dask {{ dask_version }}
- dask-labextension
- dask-ml
- datashader {{ datashader_version }}
- distributed {{ distributed_version }}
- filterpy
- holoviews
- ipython {{ ipython_version }}
Expand Down
1 change: 0 additions & 1 deletion conda/recipes/rapids/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ requirements:
- numba {{ numba_version }}
- numpy {{ numpy_version }}
- nvtx {{ nvtx_version }}
- pickle5 # [py<38]
- python
- setuptools {{ setuptools_version }}
- cudf ={{ minor_version }}.*
Expand Down
21 changes: 12 additions & 9 deletions conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ conda_verify_version:

# Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack
build_stack_version:
- '=9.4.0'
- '>=9.4.0'

# Shared versions across meta-pkgs
arrow_version:
- '=5.0.0'
- '=6.0.1'
benchmark_version:
- '=1.5.1'
black_version:
- '=19.10'
bokeh_version:
- '>=2.3.2,<2.4'
- '>=2.4.2,<=2.5'
boost_cpp_version:
- '=1.72.0'
clang_version:
Expand All @@ -49,11 +49,11 @@ cupy_version:
cython_version:
- '>=0.29.17,<0.30'
dask_version:
- '>=2021.11.1,<=2022.01.0'
- '=2022.03.0'
datashader_version:
- '>0.12,<=0.13'
- '>0.13,<0.14'
distributed_version:
- '>=2021.11.1,<=2022.01.0'
- '=2022.03.0'
dlpack_version:
- '>=0.5,<0.6.0a0'
double_conversion_version:
Expand Down Expand Up @@ -105,7 +105,7 @@ nbsphinx_version:
nccl_version:
- '>=2.9.9,<3.0a0'
networkx_version:
- '>=2.5.1'
- '>=2.5.1,<=2.6.3'
nlohmann_json_version:
- '3.9.1'
nodejs_version:
Expand All @@ -123,7 +123,7 @@ pandas_version:
pandoc_version:
- '<=2.0.0'
panel_version:
- '>=0.10.3'
- '>=0.12.7,<0.13'
pillow_version:
- '>=9.0.0'
pydeck_version:
Expand All @@ -148,10 +148,13 @@ rapidjson_version:
- '=1.1.0'
s3fs_version:
- '>=2021.08.0'
scikit_build_version:
- '=0.13.1'
scikit_image_version:
- '>=0.18.0,<0.20.0'
scikit_learn_version:
- '=0.24'
# when scipy is updated, remove upper bound on networkx ver.
scipy_version:
- '=1.6.0'
setuptools_version:
Expand All @@ -161,6 +164,6 @@ spdlog_version:
sphinx_markdown_tables_version:
- '=0.0.14=pyh9f0ad1d_1'
treelite_version:
- '=2.2.1'
- '=2.3.0'
transformers_version:
- '<=4.10.3'