Merge branch 'hotfix/v1.4.10'

dputhier · Jan 9, 2024 · 52b0219 · 52b0219
2 parents a663f0a + c529bca
commit 52b0219
Show file tree

Hide file tree

Showing 107 changed files with 269 additions and 264 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: scigenex
 Type: Package
 Title: The scigenex package (Single-Cell Informative GENe Explorer)
-Version: 1.4.9
+Version: 1.4.10
 Date: 2020-07-22
 Author: J. Bavais, Sebastien Nin, Lionel Spinelli and Denis Puthier
 Maintainer: J. Bavais <[email protected]>

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 MAKEFILE=Makefile
-VERSION=1.4.9
+VERSION=1.4.10
 
 .PHONY: help
 
@@ -87,12 +87,14 @@ release_bump: release
 	@ make install
 	@ git commit -m 'Bumped version $(VER)'
 
+readme:
+	@ echo "- Rebuilting README.md from README.Rmd"
+	@ echo "devtools::build_readme()" | R --slave
+
 doc_html:
 	@ echo "#-----------------------------------------------#"
 	@ echo "# Building doc                                  #"
 	@ echo "#-----------------------------------------------#"
-	@ echo "- Rebuilting README.md from README.Rmd"
-	@ echo "devtools::build_readme()" | R --slave
 	@ echo "Sys.setenv(RSTUDIO_PANDOC='/Applications/RStudio.app/Contents/Resources/app/quarto/bin/toolslibrary'); library(knitr); pkgdown::build_site()" | R --slave
 	@ git add -u
 	@ git commit -m "Updated html doc to $(VER)."

diff --git a/NAMESPACE b/NAMESPACE
@@ -79,6 +79,7 @@ importFrom(Seurat,NoLegend)
 importFrom(Seurat,SpatialDimPlot)
 importFrom(SeuratObject,GetAssayData)
 importFrom(SparseM,t)
+importFrom(WriteXLS,WriteXLS)
 importFrom(amap,Dist)
 importFrom(amap,hcluster)
 importFrom(biomaRt,getBM)
@@ -191,5 +192,4 @@ importFrom(utils,object.size)
 importFrom(utils,read.csv)
 importFrom(utils,read.table)
 importFrom(utils,write.table)
-importFrom(xlsx,write.xlsx)
 importMethodsFrom(methods,show)
diff --git a/R/ClusterSet_class.R b/R/ClusterSet_class.R
@@ -639,7 +639,7 @@ setGeneric("cluster_set_to_xls",
 #' @description  Write gene lists from a Cluster-Set object into an excel sheet.
 #' @param object The ClusterSet object.
 #' @param file_path The file path.
-#' @importFrom xlsx write.xlsx
+#' @importFrom WriteXLS WriteXLS
 #' @examples 
 #' #' Load an example dataset
 #' load_example_dataset('7871581/files/pbmc3k_medium_clusters')

diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,11 @@
 changelog.md
 # Changelog
 
+## v1.4.10
+
+* Fix NAMESPACE (xlxs dependency).
+* Rebuilt doc in html format.
+
 ## v1.4.9
 
 * Remove xlxs dependency in favor with WriteXLS dependency (to avoid rJava dependency).

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/usage.html b/docs/articles/usage.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/changelog.html b/docs/changelog.html