From a7d09431f56de60c6881aef12fe13b6790db78bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckpepper=E2=80=9D?= Date: Mon, 10 Jun 2019 13:45:13 +0100 Subject: [PATCH 1/5] Updated Ariba meta.yml for v2.14.0 release --- recipes/ariba/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/ariba/meta.yaml b/recipes/ariba/meta.yaml index 9f9e585d43007..b1eddbf1c6e89 100644 --- a/recipes/ariba/meta.yaml +++ b/recipes/ariba/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "2.13.5" %} -{% set sha256 = "c6471b4ae589a06ed2235da2af45129f31faa4b753ad9e708f2264b71c64a7a2" %} +{% set version = "2.14.0" %} +{% set sha256 = "361d58dc2bfa1c8722aa695633771676bbc86cf22ecd879d25106930726651d7" %} package: name: ariba @@ -24,7 +24,7 @@ requirements: - python <=3.6 - beautifulsoup4 >=4.1.0 - dendropy >=4.2.0 - - matplotlib + - matplotlib >=3.1.0 - biopython - pyfastaq >=3.12.0 - pysam >=0.9.1 From 55ea632483b64b9fdb24bcc2066bcb3809f1db57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckpepper=E2=80=9D?= Date: Mon, 10 Jun 2019 13:54:28 +0100 Subject: [PATCH 2/5] Added license_file property --- recipes/ariba/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/ariba/meta.yaml b/recipes/ariba/meta.yaml index b1eddbf1c6e89..2d795ad03abbc 100644 --- a/recipes/ariba/meta.yaml +++ b/recipes/ariba/meta.yaml @@ -47,6 +47,7 @@ about: home: https://github.com/sanger-pathogens/ariba license: GNU General Public License v3 (GPL-3.0) license_family: GPL + license_file: LICENSE summary: 'ARIBA: Antibiotic Resistance Identification By Assembly' extra: From 60543ebba01af791dfa10bbf2af520028d88b8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckpepper=E2=80=9D?= Date: Mon, 10 Jun 2019 15:56:58 +0100 Subject: [PATCH 3/5] Changed Python version selector to try to fix a Bioconda build failure --- recipes/ariba/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ariba/meta.yaml b/recipes/ariba/meta.yaml index 2d795ad03abbc..2c0f300fd99f3 100644 --- a/recipes/ariba/meta.yaml +++ b/recipes/ariba/meta.yaml @@ -18,10 +18,10 @@ requirements: - '{{ compiler("c") }}' - '{{ compiler("cxx") }}' host: - - python <=3.6 + - python <3.7 - pip run: - - python <=3.6 + - python <3.7 - beautifulsoup4 >=4.1.0 - dendropy >=4.2.0 - matplotlib >=3.1.0 From ce3fd4eca1d9751c3b6f634f190d8036c379948e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckpepper=E2=80=9D?= Date: Thu, 13 Jun 2019 14:20:48 +0100 Subject: [PATCH 4/5] Fixed bioconda build issue --- recipes/ariba/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ariba/meta.yaml b/recipes/ariba/meta.yaml index 2c0f300fd99f3..87df4f7f4db7b 100644 --- a/recipes/ariba/meta.yaml +++ b/recipes/ariba/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "2.14.0" %} -{% set sha256 = "361d58dc2bfa1c8722aa695633771676bbc86cf22ecd879d25106930726651d7" %} +{% set version = "2.14.1" %} +{% set sha256 = "7d463bf6efe271587f6755dee3cfeda083ef4875941db1e27e1d63deb152ca9b" %} package: name: ariba From c752fffe087f9169684ed6736de113e2407ab1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckpepper=E2=80=9D?= Date: Thu, 13 Jun 2019 14:37:35 +0100 Subject: [PATCH 5/5] Removed the license file property as caused a build failure. May need to add back in next release. --- recipes/ariba/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/ariba/meta.yaml b/recipes/ariba/meta.yaml index 87df4f7f4db7b..0d0dc65916ffa 100644 --- a/recipes/ariba/meta.yaml +++ b/recipes/ariba/meta.yaml @@ -47,7 +47,6 @@ about: home: https://github.com/sanger-pathogens/ariba license: GNU General Public License v3 (GPL-3.0) license_family: GPL - license_file: LICENSE summary: 'ARIBA: Antibiotic Resistance Identification By Assembly' extra: