diff --git a/nesoni/CHANGES b/nesoni/CHANGES index 6a6a9ea..e65dd72 100644 --- a/nesoni/CHANGES +++ b/nesoni/CHANGES @@ -1,5 +1,6 @@ -0.134 - Updated usage of samtools sort +0.134 - Updated usage of samtools sort. + Less picky installation check. 0.133 - Able to load counts file with no genes in R. Able to load counts file with one gene in R. diff --git a/nesoni/__init__.py b/nesoni/__init__.py index 2783591..e42a4f7 100644 --- a/nesoni/__init__.py +++ b/nesoni/__init__.py @@ -1,4 +1,4 @@ -VERSION='0.134dev' +VERSION='0.134' #^ Note: this first line is read by the setup.py script to get the version import sys diff --git a/nesoni/grace.py b/nesoni/grace.py index 36a5150..bb618c5 100644 --- a/nesoni/grace.py +++ b/nesoni/grace.py @@ -305,21 +305,19 @@ def report(line): if ok[0]: try: runr.run_script( - 'library(nesoni)\n' - 'stopifnot(nesoni_version() == version)', + 'library(nesoni)\n', silent=True,version=nesoni.VERSION) except AssertionError: path = os.path.join(os.path.dirname(__file__),'nesoni-r') - report('Nesoni R module not installed or wrong version. To install:') - report(' R CMD INSTALL '+path) + report('Nesoni R module not installed.') try: require_samtools() except Error: report('samtools not installed.') - try: require_shrimp_2() - except Error: - report('SHRiMP not installed.') + #try: require_shrimp_2() + #except Error: + # report('SHRiMP not installed.') return ok