Skip to content

Commit

Permalink
Upgrade to spdlog 1.10 (#1173)
Browse files Browse the repository at this point in the history
Updates spdlog dependency to 1.10 to match the conda-forge pinning. Depends on rapidsai/rapids-cmake#312

Also updates the flake8 pre-commit hook location since it's migrated from gitlab to github.

Authors:
  - Keith Kraus (https://github.com/kkraus14)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Bradley Dice (https://github.com/bdice)
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: #1173
  • Loading branch information
kkraus14 committed Dec 2, 2022
1 parent c1e06b9 commit 7bf7a76
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
hooks:
- id: black
args: ["--config=python/pyproject.toml"]
- repo: https://gitlab.com/pycqa/flake8
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-115_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.10
- scikit-build>=0.13.1
- spdlog>=1.8.5,<1.9
- spdlog=1.10
name: all_cuda-115_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-116_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.10
- scikit-build>=0.13.1
- spdlog>=1.8.5,<1.9
- spdlog=1.10
name: all_cuda-116_arch-x86_64
3 changes: 3 additions & 0 deletions conda/recipes/librmm/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ cmake_version:
gtest_version:
- "=1.10.0"

spdlog_version:
- "1.10"

sysroot_version:
- "2.17"
2 changes: 1 addition & 1 deletion conda/recipes/librmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ outputs:
- cmake {{ cmake_version }}
run:
- cudatoolkit {{ cuda_spec }}
- spdlog>=1.8.5,<1.9
- spdlog {{ spdlog_version }}
test:
commands:
- test -f $PREFIX/include/rmm/thrust_rmm_allocator.h
Expand Down
1 change: 0 additions & 1 deletion conda/recipes/rmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ requirements:
- python
- scikit-build>=0.13.1
- setuptools
- spdlog>=1.8.5,<2.0.0a0
run:
- cuda-python >=11.7.1,<12.0
- numba >=0.49
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies:
- scikit-build>=0.13.1
- output_types: conda
packages:
- spdlog>=1.8.5,<1.9
- spdlog=1.10
cudatoolkit:
specific:
- output_types: conda
Expand Down

0 comments on commit 7bf7a76

Please sign in to comment.