diff --git a/.circleci/config.yml b/.circleci/config.yml index d6fb8a1..fe96a7a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: rocker/verse:4.0.3 + - image: rocker/verse:4.3 environment: _R_CHECK_FORCE_SUGGESTS_: false steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 575ac8b..8e3c4ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.0.5] - Feb 22 2024 + +- Remove `/usr/lib` linking in Makevars files +- Also remove `-L"." -lpthread -lstdc++ -lm`. Not necessary. + ## [1.0.4] - July 11 2023 - Added `scale.center` argument to `dotPlot()` to plot more intuitive and correct avg. expression levels. diff --git a/DESCRIPTION b/DESCRIPTION index dd7f516..a10cac2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: sccore Title: Core Utilities for Single-Cell RNA-Seq -Version: 1.0.4 +Version: 1.0.5 Authors@R: c(person("Viktor","Petukhov", email="viktor.s.petuhov@ya.ru", role="aut"), person("Rasmus","Rydbirk", email="rrydbirk@bmb.sdu.dk", role="aut"), person("Peter", "Kharchenko", email = "peter_kharchenko@hms.harvard.edu", role = "aut"), person("Evan","Biederstedt", email="evan.biederstedt@gmail.com", role=c("aut", "cre"))) Description: Core utilities for single-cell RNA-seq data analysis. Contained within are utility functions for working with differential expression (DE) matrices and count matrices, a collection of functions for manipulating and plotting data via 'ggplot2', and functions to work with cell graphs and cell embeddings. Graph-based methods include embedding kNN cell graphs into a UMAP , collapsing vertices of each cluster in the graph, and propagating graph labels. License: GPL-3 diff --git a/README.md b/README.md index 711bd5f..3522aef 100644 --- a/README.md +++ b/README.md @@ -28,5 +28,5 @@ If you find `sccore` useful for your publication, please cite: ``` Viktor Petukhov, Rasmus Rydbirk, Peter Kharchenko and Evan Biederstedt (2021). sccore: Core Utilities for Single-Cell RNA-Seq. R package -version 1.0.4. https://github.com/kharchenkolab/sccore +version 1.0.5. https://github.com/kharchenkolab/sccore ``` diff --git a/src/Makevars b/src/Makevars index 2e830cd..9941f04 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,2 +1,2 @@ PKG_CXXFLAGS=-I"../inst/include" -PKG_LIBS=-L/usr/lib/ -L"." -lpthread -lstdc++ -lm `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS=-lpthread `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/src/Makevars.win b/src/Makevars.win index f05f126..c5cf51b 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,2 +1,2 @@ PKG_CXXFLAGS=-I"../inst/include" -PKG_LIBS=-L/usr/lib/ -L"." -lpthread -lstdc++ -lm $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS=-lpthread $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)