From 7bf7a763a3b6a32a7a57f900de35e2e5f30f17c0 Mon Sep 17 00:00:00 2001
From: Keith Kraus <keith.j.kraus@gmail.com>
Date: Fri, 2 Dec 2022 16:01:54 -0500
Subject: [PATCH] Upgrade to spdlog 1.10 (#1173)

Updates spdlog dependency to 1.10 to match the conda-forge pinning. Depends on https://github.com/rapidsai/rapids-cmake/pull/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: https://github.com/rapidsai/rmm/pull/1173
---
 .pre-commit-config.yaml                          | 2 +-
 conda/environments/all_cuda-115_arch-x86_64.yaml | 2 +-
 conda/environments/all_cuda-116_arch-x86_64.yaml | 2 +-
 conda/recipes/librmm/conda_build_config.yaml     | 3 +++
 conda/recipes/librmm/meta.yaml                   | 2 +-
 conda/recipes/rmm/meta.yaml                      | 1 -
 dependencies.yaml                                | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10a6cbcd6..356c35db7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -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
diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml
index 0f6da8e09..5177051a9 100644
--- a/conda/environments/all_cuda-115_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-115_arch-x86_64.yaml
@@ -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
diff --git a/conda/environments/all_cuda-116_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml
index 646565a90..368b008f6 100644
--- a/conda/environments/all_cuda-116_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-116_arch-x86_64.yaml
@@ -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
diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml
index 6a90ac289..9f3f371a6 100644
--- a/conda/recipes/librmm/conda_build_config.yaml
+++ b/conda/recipes/librmm/conda_build_config.yaml
@@ -13,5 +13,8 @@ cmake_version:
 gtest_version:
   - "=1.10.0"
 
+spdlog_version:
+  - "1.10"
+
 sysroot_version:
   - "2.17"
diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml
index 0fadd41a2..a6599bb33 100644
--- a/conda/recipes/librmm/meta.yaml
+++ b/conda/recipes/librmm/meta.yaml
@@ -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
diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml
index 9628df6e7..0edc9df5a 100644
--- a/conda/recipes/rmm/meta.yaml
+++ b/conda/recipes/rmm/meta.yaml
@@ -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
diff --git a/dependencies.yaml b/dependencies.yaml
index bd9b36122..8c838e96e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -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