From 858e642e4cbf81d4c1875dda638d3923f013f7ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 Mar 2020 09:14:30 +0100 Subject: gnu: python-scanpy: Update to 1.4.5.1. * gnu/packages/bioinformatics.scm (python-scanpy): Update to 1.4.5.1. [source]: Fetch from pypi. [propagated-inputs]: Add python-legacy-api-wrap, python-packaging, python-patsy, and python-umap-learn. [native-inputs]: Add python-setuptools-scm. --- gnu/packages/bioinformatics.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0c12e7c874..b0ec57bda2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13238,18 +13238,14 @@ (define-public find-circ (define-public python-scanpy (package (name "python-scanpy") - (version "1.4") - ;; Fetch from git because the pypi tarball does not include tests. + (version "1.4.5.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/theislab/scanpy.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (pypi-uri "scanpy" version)) (sha256 (base32 - "0zn6x6c0cnm1a20i6isigwb51g3pr9zpjk8r1minjqnxi5yc9pm4")))) + "14kh1ji70xxhmri5q8sgcibsidhr6f221wxrcw8a5xvibj5da17j")))) (build-system python-build-system) (arguments `(#:phases @@ -13276,18 +13272,23 @@ (define-public python-scanpy ("python-igraph" ,python-igraph) ("python-joblib" ,python-joblib) ("python-louvain" ,python-louvain) + ("python-legacy-api-wrap" ,python-legacy-api-wrap) ("python-matplotlib" ,python-matplotlib) ("python-natsort" ,python-natsort) ("python-networkx" ,python-networkx) ("python-numba" ,python-numba) + ("python-packaging" ,python-packaging) ("python-pandas" ,python-pandas) + ("python-patsy" ,python-patsy) ("python-scikit-learn" ,python-scikit-learn) ("python-scipy" ,python-scipy) ("python-seaborn" ,python-seaborn) ("python-statsmodels" ,python-statsmodels) - ("python-tables" ,python-tables))) + ("python-tables" ,python-tables) + ("python-umap-learn" ,python-umap-learn))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/theislab/scanpy") (synopsis "Single-Cell Analysis in Python.") (description "Scanpy is a scalable toolkit for analyzing single-cell gene -- cgit v1.2.3 From 3b7c644569189e735080a3de38b1ea70fb6ed89f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Mar 2020 19:28:59 +0100 Subject: gnu: r-vsn: Add r-knitr. * gnu/packages/bioinformatics.scm (r-vsn)[native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b0ec57bda2..fc05c9caf5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9360,6 +9360,8 @@ (define-public r-vsn ("r-ggplot2" ,r-ggplot2) ("r-lattice" ,r-lattice) ("r-limma" ,r-limma))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "https://bioconductor.org/packages/release/bioc/html/vsn.html") (synopsis "Variance stabilization and calibration for microarray data") (description -- cgit v1.2.3 From d56553edc3baf96d725445b8b9484ddb7625e3ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Mar 2020 19:42:34 +0100 Subject: gnu: r-methylkit: Add r-knitr. * gnu/packages/bioinformatics.scm (r-methylkit)[native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fc05c9caf5..56e207fbd4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9091,6 +9091,8 @@ (define-public r-methylkit ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-zlibbioc" ,r-zlibbioc))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes (inputs `(("zlib" ,zlib))) (home-page "https://github.com/al2na/methylKit") -- cgit v1.2.3 From 46a864e7c108ab88e7e8543b37c14c77d2339c89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 8 Mar 2020 22:48:32 +0100 Subject: gnu: taxtastic: Update to 0.8.11. * gnu/packages/bioinformatics.scm (taxtastic): Update to 0.8.11. [source]: Fetch from Github. [arguments]: Build with default Python; add phases 'prepare-directory, 'python37-compatibility, and update 'check phase. [propagated-inputs]: Replace Python 2 variants with Python 3 variants. --- gnu/packages/bioinformatics.scm | 59 +++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 17 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56e207fbd4..5adbbdd42f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6536,31 +6536,56 @@ (define-public stringtie (define-public taxtastic (package (name "taxtastic") - (version "0.8.5") + (version "0.8.11") (source (origin - (method url-fetch) - (uri (pypi-uri "taxtastic" version)) + ;; The Pypi version does not include tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/fhcrc/taxtastic.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "03pysw79lsrvz4lwzis88j15067ffqbi4cid5pqhrlxmd6bh8rrk")))) + "1sv8mkg64jn7zdwf1jj71c16686yrwxk0apb1l8sjszy9p166g0p")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:phases + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'prepare-directory + (lambda _ + ;; The git checkout must be writable for tests. + (for-each make-file-writable (find-files ".")) + ;; This test fails, but the error is not caught by the test + ;; framework, so the tests fail... + (substitute* "tests/test_taxit.py" + (("self.cmd_fails\\(''\\)") + "self.cmd_fails('nothing')")) + ;; This version file is expected to be created with git describe. + (mkdir-p "taxtastic/data") + (with-output-to-file "taxtastic/data/ver" + (lambda () (display ,version))) + #t)) + (add-after 'unpack 'python37-compatibility + (lambda _ + (substitute* "taxtastic/utils.py" + (("import csv") "import csv, errno") + (("os.errno") "errno")) + #t)) (replace 'check - (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t))))) + ;; Note, this fails to run with "-v" as it tries to write to a + ;; closed output stream. + (lambda _ (invoke "python" "-m" "unittest") #t))))) (propagated-inputs - `(("python-sqlalchemy" ,python2-sqlalchemy) - ("python-decorator" ,python2-decorator) - ("python-biopython" ,python2-biopython) - ("python-pandas" ,python2-pandas) - ("python-psycopg2" ,python2-psycopg2) - ("python-fastalite" ,python2-fastalite) - ("python-pyyaml" ,python2-pyyaml) - ("python-six" ,python2-six) - ("python-jinja2" ,python2-jinja2) - ("python-dendropy" ,python2-dendropy))) + `(("python-sqlalchemy" ,python-sqlalchemy) + ("python-decorator" ,python-decorator) + ("python-biopython" ,python-biopython) + ("python-pandas" ,python-pandas) + ("python-psycopg2" ,python-psycopg2) + ("python-fastalite" ,python-fastalite) + ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six) + ("python-jinja2" ,python-jinja2) + ("python-dendropy" ,python-dendropy))) (home-page "https://github.com/fhcrc/taxtastic") (synopsis "Tools for taxonomic naming and annotation") (description -- cgit v1.2.3 From 830eac9c27a35f09db2e28e32ad2f35040ed11ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 8 Mar 2020 23:37:09 +0100 Subject: gnu: ngless: Update to 1.1.0. * gnu/packages/bioinformatics.scm (ngless): Update to 1.1.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5adbbdd42f..b5114fd79d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13983,7 +13983,7 @@ (define-public jamm (define-public ngless (package (name "ngless") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) @@ -13993,7 +13993,7 @@ (define-public ngless (file-name (git-file-name name version)) (sha256 (base32 - "06ygv8q2zjqsnrid1302yrlhhvb8ik48nq6n0higk3i1mdc8r0dg")))) + "1wim8wpqyff080dfcazynrmjwqas38m24m0v350w245mmhrapdma")))) (build-system haskell-build-system) (arguments `(#:haddock? #f ; The haddock phase fails with: NGLess/CmdArgs.hs:20:1: -- cgit v1.2.3 From c0f64465796358e3bb71c4c6b0e7b936dd8aa99e Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 9 Mar 2020 14:34:41 +0100 Subject: gnu: Fix build of python-velocyto. * gnu/packages/bioinformatics.scm (python-velocyto): Add python-joblib to native-inputs to make the test suite run succesfully. --- gnu/packages/bioinformatics.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b5114fd79d..035a7bb808 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14453,6 +14453,8 @@ (define-public python-velocyto (base32 "0fgygyzqgrq32dv6a00biq1p1cwi6kbl5iqblxq1kklj6b2mzmhs")))) (build-system python-build-system) + (native-inputs + `(("python-joblib" ,python-joblib))) (propagated-inputs `(("python-click" ,python-click) ("python-cython" ,python-cython) -- cgit v1.2.3