Skip to content

Commit

Permalink
Merge pull request #91 from dieterich-lab/bugfix/r_depdendencies_fail…
Browse files Browse the repository at this point in the history
…_with_r4

Fix and clarification for the R dependencies
  • Loading branch information
tjakobi authored Jul 28, 2021
2 parents 0c1182f + 35580d7 commit 16d9b0e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
8 changes: 4 additions & 4 deletions docs/Installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ The default installation will install everything needed to run circtools *except

.. code-block:: bash
pip3 install circtools --user # does not require root access, installation to local user directory
pip3 install circtools --user
.. code-block:: bash
pip3 install circtools # will require root access and globally install circtools
Please note:

* The required R libraries will be installed in the default location in your home directory - unless you set enviromnet variable $R_LIBS_USER.
* In case want to install globally or into a dedicated 'venv' drop the --user option.

Installation from GitHub
--------------------------
Expand Down
12 changes: 7 additions & 5 deletions scripts/install_R_dependencies.R
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ options(repos = c(CRAN = "https://cran.uni-muenster.de/"))
# check if devtools is already installed
pkgs <- pkgs[!pkgs %in% installed.packages()[,1]]

print("R minor version:")
minorVersion <- as.numeric(strsplit(version[['minor']], '')[[1]][[1]])
majorVersion <- as.numeric(strsplit(version[['major']], '')[[1]][[1]])

print(as.numeric(strsplit(version[['minor']], '')[[1]][[1]]) )

# new installer caller for R >3.6.0
if (as.numeric(strsplit(version[['minor']], '')[[1]][[1]]) >= 6){
print(paste("R version: ", majorVersion, ".", minorVersion, sep=""))

if (
majorVersion >= 4
|| ( majorVersion == 3 && minorVersion >= 6 )
){
if (!requireNamespace("BiocManager", quietly = TRUE))
install.packages("BiocManager")

Expand Down

0 comments on commit 16d9b0e

Please sign in to comment.