Merge branch 'master' into master

AmpliconSuite · Dec 12, 2024 · 7ae7f1a · 7ae7f1a
2 parents 6a47d41 + 5117f16
commit 7ae7f1a
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 17 deletions.
diff --git a/recipes/earlgrey/meta.yaml b/recipes/earlgrey/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "EarlGrey" %}
-{% set version = "5.0.3" %}
-{% set sha256 = "5cd150f0013d941e8b20fa252cbb1340bd4a0228e83ca2c0d3aa6e34d77d7646" %}
+{% set version = "5.1.0" %}
+{% set sha256 = "1a98830a0609f204f7c755462e82ffa4f286dad60e383207ec06e202447903c1" %}
 
 package:
   name: {{ name|lower }}

diff --git a/recipes/harpy/meta.yaml b/recipes/harpy/meta.yaml
@@ -1,5 +1,5 @@
-{% set version = "1.14" %}
-{% set sha256 = "a30b119ba7e42bdb17f046269785371ff4aaf0c607fb31107f3a46c91b2e7d51" %}
+{% set version = "1.14.1" %}
+{% set sha256 = "2853cee230959803d550173fe8d7fb8c0133db96b82b3ffa97e60f1b3d59b2ad" %}
 
 package:
   name: harpy

diff --git a/recipes/immuneml/meta.yaml b/recipes/immuneml/meta.yaml
@@ -11,7 +11,7 @@ source:
 
 build:
   number: 0
-  skip: true  # [py<3.9 or py>3.10]
+  skip: true  # [py<39 or py>311 or target_platform == "osx-64"]#
   run_exports:
     - {{ pin_subpackage('immuneml', max_pin="x") }}
   entry_points:
@@ -50,8 +50,8 @@ requirements:
     - bionumpy >=0.2.31
     - npstructures
     - olga >=1.2.4
-    - keras =2.11.0
-    - tensorflow >=2.11.0
+    - tensorflow >=2.12.0
+    - keras >=2.12.0
 
 test:
   imports:

diff --git a/recipes/methbat/meta.yaml b/recipes/methbat/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "methbat" %}
-{% set version = "0.13.2" %}
-{% set sha256 = "3a3a6374170e8b2acdc5e2c160eaabdafe5d613139d0c798438794ea35bff6c5" %}
+{% set version = "0.13.3" %}
+{% set sha256 = "0efb58d178d19fb800e2ea2401702cbac6713ad78c4a4a9dfd9a3a86ddf462f0" %}
 
 package:
   name: {{ name }}

diff --git a/recipes/mycotools/meta.yaml b/recipes/mycotools/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "mycotools" %}
-{% set version = "0.32.7" %}
+{% set version = "0.32.9" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/mycotools-{{ version }}.tar.gz
-  sha256: c546759173597c9bd9497f2b92322c9c26722b98336c120c580d0028c59647ec 
+  sha256: 48b952c09923329d986f0d2dd42611570e53f0343f688bad81e322f8cd182cc2 
 
 build:
   number: 0

diff --git a/recipes/porechop_abi/build.sh b/recipes/porechop_abi/build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ $(uname -s) == "Darwin" ]; then
+    CXXFLAGS="${CXXFLAGS} -std=c++17 -Dbinary_function=__binary_function -Dunary_function=__unary_function"
+else
+    CXXFLAGS="${CXXFLAGS} -std=c++17"
+fi    
+
+python -m pip install . --ignore-installed --no-deps -vv
diff --git a/recipes/porechop_abi/meta.yaml b/recipes/porechop_abi/meta.yaml
@@ -9,11 +9,12 @@ source:
   sha256: b5252b8fc26f750a6625353fe02fdf44c9a58bc9439933921f177735eac07ca3
 
 build:
-  number: 3
+  number: 5
   skip: True  # [py < 37]
-  script: {{ PYTHON }} -m pip install . --ignore-installed --no-deps -vv
   entry_points:
     - porechop_abi = porechop_abi.porechop_abi:main
+  run_exports:
+    - {{ pin_subpackage("porechop_abi", max_pin="x.x") }}
 
 requirements:
   build:
@@ -37,6 +38,10 @@ test:
   commands:
     - porechop_abi -h
 
+extra:
+  additional-platforms:
+    - linux-aarch64
+    - osx-arm64
 about:
   home: https://github.com/bonsai-team/Porechop_ABI
   license: GPL3

diff --git a/recipes/predictosaurus/meta.yaml b/recipes/predictosaurus/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "0.2.3" %}
+{% set version = "0.2.4" %}
 
 package:
   name: predictosaurus
@@ -11,7 +11,7 @@ build:
 
 source:
   url: https://github.com/fxwiegand/predictosaurus/archive/refs/tags/v{{ version }}.tar.gz
-  sha256: 979209c4cbab4d812188efba4685f45495d9a4f4f25ddf7a0ba038bf26448085
+  sha256: 483077d12037f18b1d9eecfd8f7a3e2b0ccd06214e23b47e8e1c049b84e34abf
 
 requirements:
   build:

diff --git a/recipes/proteinortho/meta.yaml b/recipes/proteinortho/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "proteinortho" %}
-{% set version = "6.3.3" %}
-{% set sha256 = "989eed292e6e65c3725d4395cb7aed3c59754b5dc60d4a1e034aa1c4a6504c6c" %}
+{% set version = "6.3.4" %}
+{% set sha256 = "d38514e8d5a08cc99b0539348fff89a200325d46241af8ad13037ad57151c161" %}
 
 package:
   name: {{ name }}