Merge branch 'main' into index-chains-numba

scverse · Nov 1, 2023 · 3bd4b1b · 3bd4b1b
2 parents f98846b + 8cc7e73
commit 3bd4b1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
@@ -26,7 +26,7 @@ requirements:
     - awkward >=2.1.0
     - mudata >=0.2.3
     - scanpy >=1.9.3
-    - pandas >=1.5
+    - pandas >=1.5,!=2.1.2
     - numpy >=1.17.0
     - scipy
     - parasail-python

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ default_stages:
 minimum_pre_commit_version: 2.16.0
 repos:
   - repo: https://github.com/psf/black
-    rev: "23.10.0"
+    rev: "23.10.1"
     hooks:
       - id: black
   - repo: https://github.com/asottile/blacken-docs
@@ -26,7 +26,7 @@ repos:
         language_version: "17.9.1"
         exclude: '^\.conda'
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.1
+    rev: v0.1.3
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ dependencies = [
     'awkward>=2.1.0',
     'mudata>=0.2.3',
     'scanpy>=1.9.3',
-    'pandas>=1.5',
+    'pandas>=1.5,!=2.1.2',
     'numpy>=1.17.0',
     'scipy',
     # parasail 1.2.1 fails to be installd on MacOS