From c74f4b5bd59710a34271c8524c4428b53d4cb65b Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 23 Oct 2018 15:28:42 +0100 Subject: [PATCH 1/9] Bump build number for updated dependency --- recipes/bioconductor-sc3-scripts/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index 7f9f286be7d4d..3aa75005be516 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 933cfb14c0a98251dab7eb2214f5c49b75b450240b88a5863fb1c1f1b062f4e7 build: - number: 0 + number: 1 noarch: generic requirements: From 0be1712af66f76d1ef13223b00fe2e508591000c Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 23 Oct 2018 17:18:39 +0100 Subject: [PATCH 2/9] Try adding r-base to host requirements --- recipes/bioconductor-sc3-scripts/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index 3aa75005be516..db9aadf8b0aa3 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -13,6 +13,8 @@ build: noarch: generic requirements: + host: + - r-base run: - r-base - r-optparse From 01ffd29ce13624b774a0821ebcf72b5e86944abd Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 23 Oct 2018 17:41:17 +0100 Subject: [PATCH 3/9] Try adding other requirements to host --- recipes/bioconductor-sc3-scripts/meta.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index db9aadf8b0aa3..f059722e9b8fd 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -15,6 +15,13 @@ build: requirements: host: - r-base + - r-optparse + - r-workflowscriptscommon + - bioconductor-biobase + - bioconductor-scater=1.6.0 + - bioconductor-singlecellexperiment-scripts + - bioconductor-scater-scripts + - bioconductor-sc3=1.7.6 run: - r-base - r-optparse From 418e040ac16c1e91f5a7e40451fca22942b83e56 Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 23 Oct 2018 17:55:05 +0100 Subject: [PATCH 4/9] Pin to R version --- recipes/bioconductor-sc3-scripts/meta.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index f059722e9b8fd..15aab47194c9c 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -14,16 +14,9 @@ build: requirements: host: - - r-base - - r-optparse - - r-workflowscriptscommon - - bioconductor-biobase - - bioconductor-scater=1.6.0 - - bioconductor-singlecellexperiment-scripts - - bioconductor-scater-scripts - - bioconductor-sc3=1.7.6 + - r-base=3.4.1 run: - - r-base + - r-base=3.4.1 - r-optparse - r-workflowscriptscommon - bioconductor-biobase From 19b964173e216a05d98d839bd09e4bdea253684d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 23 Oct 2018 19:03:03 +0200 Subject: [PATCH 5/9] Update meta.yaml --- recipes/bioconductor-sc3-scripts/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index 15aab47194c9c..b542cc1080179 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -14,16 +14,17 @@ build: requirements: host: - - r-base=3.4.1 + - r-base run: - - r-base=3.4.1 + - r-base - r-optparse - r-workflowscriptscommon - bioconductor-biobase - - bioconductor-scater=1.6.0 + - bioconductor-scater 1.6. - bioconductor-singlecellexperiment-scripts - bioconductor-scater-scripts - - bioconductor-sc3=1.7.6 + - bioconductor-sc3 1.7.6 + test: commands: - sc3-sc3-prepare.R --help From 08a077546b259f26b1b0a7eb4f60d1bc1f728145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 23 Oct 2018 19:06:59 +0200 Subject: [PATCH 6/9] Update meta.yaml --- recipes/bioconductor-sc3-scripts/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index b542cc1080179..a4811590c5801 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -20,7 +20,7 @@ requirements: - r-optparse - r-workflowscriptscommon - bioconductor-biobase - - bioconductor-scater 1.6. + - bioconductor-scater 1.6.* - bioconductor-singlecellexperiment-scripts - bioconductor-scater-scripts - bioconductor-sc3 1.7.6 From 4485691fe7b9674a128545235beb8d426816bdba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 23 Oct 2018 19:19:14 +0200 Subject: [PATCH 7/9] Update meta.yaml --- recipes/bioconductor-sc3-scripts/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index a4811590c5801..4ffad644f17a6 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -20,10 +20,10 @@ requirements: - r-optparse - r-workflowscriptscommon - bioconductor-biobase - - bioconductor-scater 1.6.* + - bioconductor-scater - bioconductor-singlecellexperiment-scripts - bioconductor-scater-scripts - - bioconductor-sc3 1.7.6 + - bioconductor-sc3 test: commands: From 6cda9d5a2c17a0dc62ffd9d7e0196f3f65999bd3 Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 23 Oct 2018 18:23:41 +0100 Subject: [PATCH 8/9] Tweak dependency version syntax --- recipes/bioconductor-sc3-scripts/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index 15aab47194c9c..cb28a5b88abeb 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -14,16 +14,16 @@ build: requirements: host: - - r-base=3.4.1 + - r-base 3.4.1 run: - - r-base=3.4.1 + - r-base 3.4.1 - r-optparse - r-workflowscriptscommon - bioconductor-biobase - - bioconductor-scater=1.6.0 + - bioconductor-scater 1.6.0 - bioconductor-singlecellexperiment-scripts - bioconductor-scater-scripts - - bioconductor-sc3=1.7.6 + - bioconductor-sc3 1.7.6 test: commands: - sc3-sc3-prepare.R --help From 48d0c08a7ee62ddd2d39b79e77e706ab0c7ddb76 Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 23 Oct 2018 18:51:01 +0100 Subject: [PATCH 9/9] Pin R and package versions correctly --- recipes/bioconductor-sc3-scripts/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/bioconductor-sc3-scripts/meta.yaml b/recipes/bioconductor-sc3-scripts/meta.yaml index 4ffad644f17a6..d654558735de7 100644 --- a/recipes/bioconductor-sc3-scripts/meta.yaml +++ b/recipes/bioconductor-sc3-scripts/meta.yaml @@ -14,16 +14,16 @@ build: requirements: host: - - r-base + - r-base 3.4.1 run: - - r-base + - r-base 3.4.1 - r-optparse - r-workflowscriptscommon - bioconductor-biobase - - bioconductor-scater + - bioconductor-scater 1.6.0 - bioconductor-singlecellexperiment-scripts - bioconductor-scater-scripts - - bioconductor-sc3 + - bioconductor-sc3 1.7.6 test: commands: