Skip to content

Commit

Permalink
Merge branch 'branch-21.12' of https://github.com/rapidsai/cudf into …
Browse files Browse the repository at this point in the history
…fea-nvcomp-default-use
  • Loading branch information
vuule committed Nov 5, 2021
2 parents 6580935 + 4cba672 commit 41a6b03
Show file tree
Hide file tree
Showing 68 changed files with 2,953 additions and 2,282 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ repos:
# Note that pre-commit autoupdate does not update the versions
# of dependencies, so we'll have to update this manually.
additional_dependencies:
- cmakelang==0.6.13
- cmake-format==0.6.11
- id: cmake-lint
name: cmake-lint
entry: bash cpp/scripts/run-cmake-format.sh cmake-lint
Expand All @@ -87,7 +87,7 @@ repos:
# Note that pre-commit autoupdate does not update the versions
# of dependencies, so we'll have to update this manually.
additional_dependencies:
- cmakelang==0.6.13
- cmake-format==0.6.11

default_language_version:
python: python3
5 changes: 5 additions & 0 deletions ci/checks/style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ LANG=C.UTF-8
. /opt/conda/etc/profile.d/conda.sh
conda activate rapids

FORMAT_FILE_URL=https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/cmake-format-rapids-cmake.json
export RAPIDS_CMAKE_FORMAT_FILE=/tmp/rapids_cmake_ci/cmake-formats-rapids-cmake.json
mkdir -p $(dirname ${RAPIDS_CMAKE_FORMAT_FILE})
wget -O ${RAPIDS_CMAKE_FORMAT_FILE} ${FORMAT_FILE_URL}

pre-commit run --hook-stage manual --all-files
PRE_COMMIT_RETVAL=$?

Expand Down
68 changes: 68 additions & 0 deletions conda/environments/cudf_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Copyright (c) 2021, NVIDIA CORPORATION.

name: cudf_dev
channels:
- rapidsai
- nvidia
- rapidsai-nightly
- conda-forge
dependencies:
- clang=11.0.0
- clang-tools=11.0.0
- cupy>7.1.0,<10.0.0a0
- rmm=21.12.*
- cmake>=3.20.1
- cmake_setuptools>=0.1.3
- python>=3.7,<3.9
- numba>=0.53.1
- numpy
- pandas>=1.0,<1.4.0dev0
- pyarrow=5.0.0=*cuda
- fastavro>=0.22.9
- python-snappy>=0.6.0
- notebook>=0.5.0
- cython>=0.29,<0.30
- fsspec>=0.6.0
- pytest
- pytest-benchmark
- pytest-xdist
- sphinx
- sphinxcontrib-websupport
- nbsphinx
- numpydoc
- ipython
- pandoc=<2.0.0
- cudatoolkit=11.5
- pip
- flake8=3.8.3
- black=19.10
- isort=5.6.4
- mypy=0.782
- pydocstyle=6.1.1
- typing_extensions
- pre-commit
- dask>=2021.09.1
- distributed>=2021.09.1
- streamz
- arrow-cpp=5.0.0
- dlpack>=0.5,<0.6.0a0
- arrow-cpp-proc * cuda
- double-conversion
- rapidjson
- hypothesis
- sphinx-markdown-tables
- sphinx-copybutton
- mimesis<4.1
- packaging
- protobuf
- nvtx>=0.2.1
- cachetools
- transformers<=4.10.3
- pydata-sphinx-theme
- librdkafka=1.7.0
- python-confluent-kafka=1.7.0
- pip:
- git+https://github.com/dask/dask.git@main
- git+https://github.com/dask/distributed.git@main
- git+https://github.com/python-streamz/streamz.git@master
- pyorc
Loading

0 comments on commit 41a6b03

Please sign in to comment.