From 0e9b64e7b791017534e748a6588d54503054ca6f Mon Sep 17 00:00:00 2001 From: CarlosHorro Date: Thu, 7 Feb 2019 13:46:42 +0100 Subject: [PATCH 01/10] Enforced python v3.4 or later as pymzml requires it. --- recipes/moff/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index b0cdff246d06e..d3298a94b7e90 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -14,7 +14,7 @@ build: requirements: host: - - python + - python >=3.4 - pandas >=0.23.* - numpy >=1.15.* - scipy >=1.1.* @@ -24,18 +24,18 @@ requirements: - simplejson >=3.16.1 - brain-isotopic-distribution - pyteomics >=3.5 - - pymzml >=2.0.5 + - pymzml >=2.0.5 run: - - python + - python >=3.4 - pandas >=0.23.* - numpy >=1.15.* - scipy >=1.1.* - scikit-learn >0.19 - - pymzml + - pymzml - mono - simplejson >=3.16.1 - - brain-isotopic-distribution + - brain-isotopic-distribution - pyteomics >=3.5 - pymzml >=2.0.5 From 2e89f6745bd430bbf7092ab1acb763e537751b01 Mon Sep 17 00:00:00 2001 From: CarlosHorro Date: Thu, 7 Feb 2019 13:47:51 +0100 Subject: [PATCH 02/10] Increased build number --- recipes/moff/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index d3298a94b7e90..d6c3d4a3bf1e4 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 42ded39204b4ffd536d2ea9f0b22350ec7a228c6d497d3f3028d3cf6af6810d9 build: - number: 0 + number: 1 skip: True # [py27 or py35] requirements: From 77c294bf59e40352c24c16634a5bcad715247ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Fri, 8 Feb 2019 10:36:30 +0100 Subject: [PATCH 03/10] Update meta.yaml --- recipes/moff/meta.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index d6c3d4a3bf1e4..b8e220b83e530 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -10,14 +10,13 @@ source: build: number: 1 - skip: True # [py27 or py35] requirements: host: - python >=3.4 - - pandas >=0.23.* - - numpy >=1.15.* - - scipy >=1.1.* + - pandas >=0.23 + - numpy >=1.15 + - scipy >=1.1 - scikit-learn >=0.19 - pymzml - mono @@ -28,9 +27,9 @@ requirements: run: - python >=3.4 - - pandas >=0.23.* - - numpy >=1.15.* - - scipy >=1.1.* + - pandas >=0.23 + - numpy >=1.15 + - scipy >=1.1 - scikit-learn >0.19 - pymzml - mono From b82d91b3471eaf9d8291e760f55427eef807b338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Mon, 11 Feb 2019 19:20:37 +0100 Subject: [PATCH 04/10] Update meta.yaml --- recipes/moff/meta.yaml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index b8e220b83e530..52d1633546066 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -10,33 +10,24 @@ source: build: number: 1 + noarch: python + script: "{{ PYTHON }} -m pip install . --no-deps -vv" requirements: host: - python >=3.4 - - pandas >=0.23 - - numpy >=1.15 - - scipy >=1.1 - - scikit-learn >=0.19 - - pymzml - - mono - - simplejson >=3.16.1 - - brain-isotopic-distribution - - pyteomics >=3.5 - - pymzml >=2.0.5 - + - pip run: - python >=3.4 - pandas >=0.23 - numpy >=1.15 - scipy >=1.1 - scikit-learn >0.19 - - pymzml - mono - simplejson >=3.16.1 - brain-isotopic-distribution - pyteomics >=3.5 - - pymzml >=2.0.5 + - pymzml >=2.0.6.1 test: commands: From 568020bd3c256aabbd305785287507ab07d7b962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Mon, 11 Feb 2019 19:21:05 +0100 Subject: [PATCH 05/10] Update meta.yaml --- recipes/moff/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index 52d1633546066..33155975fb495 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -11,12 +11,10 @@ source: build: number: 1 noarch: python - script: "{{ PYTHON }} -m pip install . --no-deps -vv" requirements: host: - python >=3.4 - - pip run: - python >=3.4 - pandas >=0.23 From 06e2c31fbe7e142fd6d32122163ecfc3cfb72484 Mon Sep 17 00:00:00 2001 From: CarlosHorro Date: Tue, 12 Feb 2019 11:55:43 +0100 Subject: [PATCH 06/10] Fixed reference to pymzml >=2.0.6 --- recipes/moff/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index 33155975fb495..8501c52cfd445 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -25,7 +25,7 @@ requirements: - simplejson >=3.16.1 - brain-isotopic-distribution - pyteomics >=3.5 - - pymzml >=2.0.6.1 + - pymzml >=2.0.6 test: commands: From 43e97bdb7d0c3044e36f8c86efc881d4cc530d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 12 Feb 2019 13:18:28 +0100 Subject: [PATCH 07/10] Update meta.yaml --- recipes/moff/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index 8501c52cfd445..6be2861cc7487 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -10,7 +10,6 @@ source: build: number: 1 - noarch: python requirements: host: From f326222119557182abc95bc66ec63c37021cb084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 12 Feb 2019 14:07:39 +0100 Subject: [PATCH 08/10] Update meta.yaml From 982e98b4dfee92ac7a1b763a284943cb5ab0bddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 12 Feb 2019 14:11:57 +0100 Subject: [PATCH 09/10] add extra section --- recipes/moff/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index 6be2861cc7487..e2737ae36b413 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -35,3 +35,9 @@ about: license: Apache 2.0 license_file: license summary: moFF is an OS independent tool designed to extract apex MS1 intensity using a set of identified MS2 peptides. + +extra: + skip-lints: + - should_be_noarch + identifiers: + - doi:10.1021/acs.jproteome.8b00708 From bada0997a0f9f6da642c7d1c79f09a9e5bbaf6ca Mon Sep 17 00:00:00 2001 From: CarlosHorro Date: Fri, 15 Feb 2019 15:59:13 +0100 Subject: [PATCH 10/10] Avoiding dependency problem with Python 3.7 --- recipes/moff/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/moff/meta.yaml b/recipes/moff/meta.yaml index e2737ae36b413..4639bb3e9b616 100644 --- a/recipes/moff/meta.yaml +++ b/recipes/moff/meta.yaml @@ -13,9 +13,9 @@ build: requirements: host: - - python >=3.4 + - python >=3.4,<3.7 run: - - python >=3.4 + - python >=3.4,<3.7 - pandas >=0.23 - numpy >=1.15 - scipy >=1.1