Revert "Upgrade to spdlog 1.10 (rapidsai#1173)"

This reverts commit 7bf7a76.
bdice · Dec 5, 2022 · eb70815 · eb70815
1 parent 7bf7a76
commit eb70815
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 8 deletions.
diff --git 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://github.com/PyCQA/flake8
+    - repo: https://gitlab.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
@@ -22,5 +22,5 @@ dependencies:
 - pytest-cov
 - python>=3.8,<3.10
 - scikit-build>=0.13.1
-- spdlog=1.10
+- spdlog>=1.8.5,<1.9
 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
@@ -22,5 +22,5 @@ dependencies:
 - pytest-cov
 - python>=3.8,<3.10
 - scikit-build>=0.13.1
-- spdlog=1.10
+- spdlog>=1.8.5,<1.9
 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
@@ -13,8 +13,5 @@ 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
@@ -53,7 +53,7 @@ outputs:
         - cmake {{ cmake_version }}
       run:
         - cudatoolkit {{ cuda_spec }}
-        - spdlog {{ spdlog_version }}
+        - spdlog>=1.8.5,<1.9
     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
@@ -48,6 +48,7 @@ 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
@@ -43,7 +43,7 @@ dependencies:
           - scikit-build>=0.13.1
       - output_types: conda
         packages:
-          - spdlog=1.10
+          - spdlog>=1.8.5,<1.9
   cudatoolkit:
     specific:
       - output_types: conda