Skip to content

Commit

Permalink
version 0.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TomKellyGenetics committed Jan 18, 2020
1 parent 8046886 commit f0e443d
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This package was submitted to CRAN on 2019-07-23.
Once it is accepted, delete this file and tag the release (commit 9927f9eefe).
This package was submitted to CRAN on 2020-01-18.
Once it is accepted, delete this file and tag the release (commit 4bad225648).
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: leiden
Type: Package
Title: R Implementation of Leiden Clustering Algorithm
Version: 0.3.1.9001
Date: 2019-07-23
Version: 0.3.2
Date: 2020-01-17
Authors@R: c(person("S. Thomas", "Kelly", email = "tom.kelly@riken.jp", role = c("aut", "cre", "trl")),
person("Vincent A.", "Traag", email = "v.a.traag@cwts.leidenuniv.nl", role = c("com")))
Description: Implements the 'Python leidenalg' module to be called in R.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Leiden Algorithm

## leiden version 0.3.1
## leiden version 0.3.2

[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/leiden)](https://cran.r-project.org/package=leiden)
[![Travis Build Status](https://travis-ci.org/TomKellyGenetics/leiden.svg?branch=master)](https://travis-ci.org/TomKellyGenetics/leiden)
Expand Down Expand Up @@ -274,15 +274,15 @@ Please cite this implementation R in if you use it:
To cite the leiden package in publications use:
S. Thomas Kelly (2019). leiden: R implementation of the Leiden algorithm. R
package version 0.3.1 https://github.com/TomKellyGenetics/leiden
package version 0.3.2 https://github.com/TomKellyGenetics/leiden
A BibTeX entry for LaTeX users is
@Manual{,
title = {leiden: R implementation of the Leiden algorithm},
author = {S. Thomas Kelly},
year = {2018},
note = {R package version 0.3.1},
note = {R package version 0.3.2},
url = {https://github.com/TomKellyGenetics/leiden},
}
```
Expand Down
4 changes: 2 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

## Updates

Minor update to include parameters for find_partitions (python module).
Minor update to include support for weighted igraph objects.

This release is compatible with proposed changes to the Seurat (v3.0.3) package. This version will be a dependency of Seurat. This version of Seurat is not available for checking with revdep but has been checked locally after installing the develop version from GitHub.
This release is compatible with proposed changes to the Seurat (v3.1.2) package. This version will be a dependency of Seurat. This version of Seurat is not available for checking with revdep but has been checked locally after installing the develop version from GitHub.

## Python integration

Expand Down
4 changes: 2 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ citEntry(entry = "Manual",
title = "leiden: R implementation of the Leiden algorithm",
author = personList(as.person("S. Thomas Kelly")),
year = "2019",
note = "R package version 0.3.1",
note = "R package version 0.3.2",
url = "https://github.com/TomKellyGenetics/leiden",

textVersion =
paste("S. Thomas Kelly (2019). leiden: R implementation of the Leiden algorithm. R package version 0.3.1",
paste("S. Thomas Kelly (2019). leiden: R implementation of the Leiden algorithm. R package version 0.3.2",
"https://github.com/TomKellyGenetics/leiden")
)

Expand Down
22 changes: 11 additions & 11 deletions vignettes/benchmarking.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ library("leiden")
library("reticulate")
py_available()
module <- py_available() && py_numpy_available() && py_module_available("leidenalg") && py_module_available("igraph")
if(py_available() && !module){
reticulate::install_miniconda()
py_config()$python
reticulate::conda_create("r-reticulate")
reticulate::use_condaenv("r-reticulate")
conda_install("r-reticulate", "numpy")
conda_install("r-reticulate", "scipy")
reticulate::conda_install("r-reticulate", "python-igraph")
reticulate::py_install("r-reticulate", "leidenalg")
module <- py_module_available("leidenalg") && py_module_available("igraph")
}
# if(module){
# reticulate::install_miniconda()
# py_config()$python
# reticulate::conda_create("r-reticulate")
# reticulate::use_condaenv("r-reticulate")
# conda_install("r-reticulate", "numpy")
# conda_install("r-reticulate", "scipy")
# reticulate::conda_install("r-reticulate", "python-igraph")
# reticulate::py_install("r-reticulate", "leidenalg")
# module <- py_module_available("leidenalg") && py_module_available("igraph")
# }
if(module){
leidenalg <- import("leidenalg", delay_load = TRUE)
ig <- import("igraph", delay_load = TRUE)
Expand Down

0 comments on commit f0e443d

Please sign in to comment.