From 6790e53be52e117d189eb92f3d28015bbb0ad536 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Mon, 12 Aug 2024 09:42:22 +0000 Subject: [PATCH 01/10] Updated Spec2Vec recipe with new matchms limits --- recipes/spec2vec/meta.yaml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index 9451b70876035..1170c99d61d70 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -11,20 +11,21 @@ source: build: noarch: python - script: {{ PYTHON }} -m pip install . -vv - number: 0 + script: {{ PYTHON }} -m pip install --no-deps --ignore-installed . -vv + number: 1 requirements: host: - python >=3.7 - pip run: - - python >=3.7 - - gensim >=4.0.0 - - matchms >=0.11.0 + - gensim >=4.2.0 + - matchms >=0.14.0, <=0.26.4 - numba >=0.51 - numpy - - fuzzytm + - pip + - python >=3.7 + - scipy <=1.10.1 - tqdm test: @@ -37,9 +38,13 @@ test: about: home: https://github.com/iomega/spec2vec - summary: Word2Vec based similarity measure of mass spectrometry data. license: Apache-2.0 + license_family: APACHE license_file: LICENSE + summary: Word2Vec based similarity measure of mass spectrometry data. + description: Word2Vec based similarity measure of mass spectrometry data. + doc_url: https://spec2vec.readthedocs.io/ + dev_url: https://github.com/iomega/spec2vec extra: recipe-maintainers: From 59ec1c3b8df8a779a45f586d3507e270be63ea82 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Mon, 12 Aug 2024 09:43:43 +0000 Subject: [PATCH 02/10] Update meta.yaml --- recipes/spec2vec/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index 1170c99d61d70..580ec057f8712 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -13,6 +13,8 @@ build: noarch: python script: {{ PYTHON }} -m pip install --no-deps --ignore-installed . -vv number: 1 + run_exports: + - {{ pin_subpackage("spec2vec", max_pin="x.x") }} requirements: host: From 211621912d8a76aafd2019ffd002335ffa286f8c Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Mon, 12 Aug 2024 14:47:46 +0200 Subject: [PATCH 03/10] pinned gensim and removed other pins --- recipes/spec2vec/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index 580ec057f8712..d83956831d90d 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -18,16 +18,16 @@ build: requirements: host: - - python >=3.7 + - python >=3.10 - pip run: - - gensim >=4.2.0 + - gensim ==4.3.2 - matchms >=0.14.0, <=0.26.4 - - numba >=0.51 + - numba - numpy - pip - - python >=3.7 - - scipy <=1.10.1 + - python >=3.10 + - scipy - tqdm test: From 0fd6380a4583c91c226306f8ce3fe2bc063d1734 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Tue, 13 Aug 2024 06:18:30 +0000 Subject: [PATCH 04/10] Update meta.yaml --- recipes/spec2vec/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index d83956831d90d..2e76fcfc86969 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -18,15 +18,15 @@ build: requirements: host: - - python >=3.10 + - python >=3.9,<3.12 - pip run: + - python >=3.9,<3.12 - gensim ==4.3.2 - matchms >=0.14.0, <=0.26.4 - numba - numpy - pip - - python >=3.10 - scipy - tqdm From 0517b4ac1847f6c106fcca616a4a6b42941102ca Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Tue, 13 Aug 2024 09:58:48 +0200 Subject: [PATCH 05/10] removed other deps --- recipes/spec2vec/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index 2e76fcfc86969..c259fdf1c15d8 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -11,7 +11,7 @@ source: build: noarch: python - script: {{ PYTHON }} -m pip install --no-deps --ignore-installed . -vv + script: "{{ PYTHON }} -m pip install . --no-deps --no-build-isolation --no-cache-dir -vvv" number: 1 run_exports: - {{ pin_subpackage("spec2vec", max_pin="x.x") }} @@ -20,14 +20,13 @@ requirements: host: - python >=3.9,<3.12 - pip + - python >=3.9,<3.12 run: - python >=3.9,<3.12 - gensim ==4.3.2 - - matchms >=0.14.0, <=0.26.4 + - matchms >=0.14.0,<=0.26.4 - numba - - numpy - pip - - scipy - tqdm test: From 23cb8780127b29f1c3928a608a206ae38156544a Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Tue, 13 Aug 2024 10:23:05 +0200 Subject: [PATCH 06/10] pin matchms --- recipes/spec2vec/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index c259fdf1c15d8..fbf1cdbe004bc 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -24,7 +24,7 @@ requirements: run: - python >=3.9,<3.12 - gensim ==4.3.2 - - matchms >=0.14.0,<=0.26.4 + - matchms ==0.26.4 - numba - pip - tqdm From 1f3ba784b2736cb0343081542d7b3f08a14bea92 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Tue, 13 Aug 2024 10:24:13 +0200 Subject: [PATCH 07/10] removed duplicated python --- recipes/spec2vec/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index fbf1cdbe004bc..386cc873a872d 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -18,9 +18,8 @@ build: requirements: host: - - python >=3.9,<3.12 + - python - pip - - python >=3.9,<3.12 run: - python >=3.9,<3.12 - gensim ==4.3.2 From 681f59dcd84a59bc58e6126c1198f67a13b8b3d2 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Tue, 13 Aug 2024 11:13:10 +0200 Subject: [PATCH 08/10] new recipe generated with grayskull --- recipes/spec2vec/meta.yaml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index 386cc873a872d..55adbd1cda04a 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -11,21 +11,17 @@ source: build: noarch: python - script: "{{ PYTHON }} -m pip install . --no-deps --no-build-isolation --no-cache-dir -vvv" - number: 1 - run_exports: - - {{ pin_subpackage("spec2vec", max_pin="x.x") }} + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 requirements: host: - - python + - python >=3.7 - pip run: - - python >=3.9,<3.12 - - gensim ==4.3.2 + - python >=3.7 + - gensim >=4.2.0 - matchms ==0.26.4 - - numba - - pip - tqdm test: @@ -38,15 +34,10 @@ test: about: home: https://github.com/iomega/spec2vec + summary: Word2Vec based similarity measure of mass spectrometry data. license: Apache-2.0 - license_family: APACHE license_file: LICENSE - summary: Word2Vec based similarity measure of mass spectrometry data. - description: Word2Vec based similarity measure of mass spectrometry data. - doc_url: https://spec2vec.readthedocs.io/ - dev_url: https://github.com/iomega/spec2vec extra: recipe-maintainers: - - bgruening - hechth From 6961cdad2617c2355e849584e0a09a974ddb3094 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Tue, 13 Aug 2024 11:21:49 +0200 Subject: [PATCH 09/10] lint --- recipes/spec2vec/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index 55adbd1cda04a..f70c46f33c636 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -12,7 +12,9 @@ source: build: noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 0 + number: 1 + run_exports: + - {{ pin_subpackage("spec2vec", max_pin="x.x") }} requirements: host: @@ -41,3 +43,4 @@ about: extra: recipe-maintainers: - hechth + - bgruening From a7728254f44336ca198c6a47a039c40f1a9f2d3d Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Mon, 2 Sep 2024 13:19:21 +0000 Subject: [PATCH 10/10] Update meta.yaml --- recipes/spec2vec/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/spec2vec/meta.yaml b/recipes/spec2vec/meta.yaml index f70c46f33c636..cd74d09848b4a 100644 --- a/recipes/spec2vec/meta.yaml +++ b/recipes/spec2vec/meta.yaml @@ -21,9 +21,9 @@ requirements: - python >=3.7 - pip run: - - python >=3.7 - - gensim >=4.2.0 - - matchms ==0.26.4 + - python >=3.10 + - gensim >=4.3.3 + - matchms >=0.26.4 - tqdm test: