Skip to content

Commit

Permalink
Backport PR scverse#2566: Switch to igraph name
Browse files Browse the repository at this point in the history
  • Loading branch information
flying-sheep authored and meeseeksmachine committed Jul 21, 2023
1 parent c8fa71d commit 6419aee
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -18,6 +18,7 @@
/scanpy/tests/notebooks/figures/

# Environment management
/hatch.toml
/Pipfile
/Pipfile.lock

Expand Down
6 changes: 3 additions & 3 deletions docs/installation.md
Expand Up @@ -24,7 +24,7 @@ pip install 'scanpy[leiden]'
```

The extra `[leiden]` installs two packages that are needed for popular
parts of scanpy but aren't requirements: [python-igraph] [^cite_csardi06] and [leiden] [^cite_traag18].
parts of scanpy but aren't requirements: [igraph] [^cite_csardi06] and [leiden] [^cite_traag18].

(dev-install-instructions)=

Expand Down Expand Up @@ -83,7 +83,7 @@ pip install --user scanpy

- `brew install igraph`

- If python-igraph still fails to install, see the question on [compiling igraph].
- If igraph still fails to install, see the question on [compiling igraph].
Alternatively consider installing gcc via `brew install gcc --without-multilib`
and exporting the required variables:

Expand Down Expand Up @@ -125,5 +125,5 @@ The whole process takes just a couple of minutes.
[leiden]: https://leidenalg.readthedocs.io
[miniconda]: http://conda.pydata.org/miniconda.html
[on github]: https://github.com/scverse/scanpy
[python-igraph]: http://igraph.org/python/
[igraph]: https://python.igraph.org/en/stable/
[unofficial binaries]: https://www.lfd.uci.edu/~gohlke/pythonlibs/
6 changes: 3 additions & 3 deletions pyproject.toml
Expand Up @@ -121,9 +121,9 @@ dev = [
"docutils",
]
# Algorithms
paga = ["python-igraph"]
louvain = ["python-igraph", "louvain>=0.6,!=0.6.2"] # Louvain community detection
leiden = ["python-igraph", "leidenalg"] # Leiden community detection
paga = ["igraph"]
louvain = ["igraph", "louvain>=0.6,!=0.6.2"] # Louvain community detection
leiden = ["igraph>=0.10", "leidenalg>=0.9"] # Leiden community detection
bbknn = ["bbknn"] # Batch balanced KNN (batch correction)
magic = ["magic-impute>=2.0"] # MAGIC imputation method
skmisc = ["scikit-misc>=0.1.3"] # highly_variable_genes method 'seurat_v3'
Expand Down
2 changes: 1 addition & 1 deletion scanpy/logging.py
Expand Up @@ -127,7 +127,7 @@ def format(self, record: logging.LogRecord):
'pandas',
('sklearn', 'scikit-learn'),
'statsmodels',
('igraph', 'python-igraph'),
'igraph',
'louvain',
'leidenalg',
'pynndescent',
Expand Down
2 changes: 1 addition & 1 deletion scanpy/testing/_pytest/marks.py
Expand Up @@ -10,7 +10,7 @@
louvain="louvain",
skmisc="scikit-misc",
fa2="fa2",
igraph="python-igraph",
igraph="igraph",
dask="dask",
zarr="zarr",
zappy="zappy",
Expand Down

0 comments on commit 6419aee

Please sign in to comment.