Merge branch 'master' into gzrt

bioconda · Nov 3, 2024 · dc95ebe · dc95ebe
2 parents 68cc06e + a425455
commit dc95ebe
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 92 deletions.
diff --git a/ntstat/build.sh b/ntstat/build.sh
diff --git a/ntstat/meta.yaml b/ntstat/meta.yaml
diff --git a/recipes/jbrowse2/meta.yaml b/recipes/jbrowse2/meta.yaml
@@ -1,12 +1,12 @@
 # When updating, check the @jbrowse/cli version in build.sh too
-{% set version = "2.16.0" %}
+{% set version = "2.16.1" %}
 
 package:
   name: jbrowse2
   version: {{ version }}
 
 source:
-  sha256: 5f58748cf7c3dcbaddbf87e123cfa878f0d64d3e965bd2ac9bda1b359db40dfd
+  sha256: b869ab507a765e775dd961d5abfb0b1982dd01b3dd7648d9c3d062c2fab32cfe
   url: https://github.com/GMOD/jbrowse-components/releases/download/v{{ version }}/jbrowse-web-v{{ version }}.zip
 
 build:

diff --git a/recipes/meta/build.sh → recipes/meta-neuro/build.sh b/recipes/meta/build.sh → recipes/meta-neuro/build.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ex
 
 unset LD LINK ARCH
 export CMAKE_INSTALL_RPATH='$ORIGIN/../lib'
@@ -8,8 +9,12 @@ mkdir -p "$PREFIX/bin"
 mkdir -p "$PREFIX/lib"
 mkdir -p "$PREFIX/share"
 mkdir -p $SRC_DIR/build
-cd $SRC_DIR/build || exit 1
 
+## copy small test data:
+mkdir -p $PREFIX/share/meta-neuro/example
+cp $SRC_DIR/resources/test.nii.gz $PREFIX/share/meta-neuro/example/
+
+cd $SRC_DIR/build
 cmake -S $SRC_DIR -B $SRC_DIR/build  \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
@@ -19,10 +24,12 @@ cmake -S $SRC_DIR -B $SRC_DIR/build  \
     -DCMAKE_INSTALL_RPATH=$CMAKE_INSTALL_RPATH \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH=$CMAKE_BUILD_WITH_INSTALL_RPATH
 
-cmake --build . --config Release --parallel ${CPU_COUNT} --verbose || exit 1
-cmake --install . || exit 1
+cmake --build . --config Release --parallel ${CPU_COUNT} --verbose
+cmake --install .
+
+# Clean up build directory
 rm -rf $SRC_DIR/build
 
 # Install MeTA package
-cd ${SRC_DIR} || exit 1
-${PYTHON} -m pip install . --no-deps -vv || exit 1
+cd ${SRC_DIR}
+${PYTHON} -m pip install . --no-deps -vv
diff --git a/recipes/meta-neuro/conda_build_config.yaml b/recipes/meta-neuro/conda_build_config.yaml
@@ -0,0 +1,18 @@
+build_variant:
+  - "osmesa"  # [linux]
+  - "qt"      # [osx]
+
+python:
+  - 3.11.*  *_cpython
+  - 3.10.*  *_cpython
+  - 3.9.*  *_cpython
+
+python_impl:
+  - cpython
+  - cpython
+  - cpython
+
+numpy:
+  - 1.23.*
+  - 1.22.*
+  - 1.22.*
diff --git a/recipes/meta/meta.yaml → recipes/meta-neuro/meta.yaml b/recipes/meta/meta.yaml → recipes/meta-neuro/meta.yaml
@@ -1,7 +1,6 @@
-{% set name = "meta" %}
+{% set name = "meta-neuro" %}
 {% set version = "1.0.0" %}
-{% set sha256 = "a35dd5bc3ccffaaf83aa488233467ae85dc5374aea3068c34a6dc85ea29e27a9" %}
-{% set build_variant = "osmesa" if linux else "qt" %}
+{% set sha256 = "c67bcad0899fc3f9c890ee26e9c1c2ab1a892430ce00a9ac090e36697efc9434" %}
 
 package:
   name: {{ name|lower }}
@@ -13,9 +12,9 @@ source:
 
 build:
   number: 0
-  skip: true # [not py39]
+  skip: true  # [win ]
   run_exports:
-    - {{ pin_subpackage('meta', max_pin="x") }}
+    - {{ pin_subpackage('meta-neuro', max_pin="x.x.x") }}
 
 requirements:
   build:
@@ -24,45 +23,38 @@ requirements:
     - make  # [not win]
 
   host:
-    - python >=3.9,<3.10
-    - pip
-    - boost =1.82
-    - itk =5.3.0
-    - libitk =5.3.0
-    - libitk-devel =5.3.0
+    - vtk >=9.2.6,<9.3.0 build=*{{ build_variant }}*
+    - libitk-devel ==5.3.0
     - hdf5 >=1.14.2,<1.14.3.0a0
-    - vtk-base >=9.2.6,<9.3.0 build=*{{ build_variant }}*
-    - libexpat >=2.5.0,<2.6.0
-    - vtk-io-ffmpeg >=9.2.6,<9.3.0 build=*{{ build_variant }}*
+    - libboost-python-devel >=1.82.0,<1.83.0
+    - python
+    - pip
+    - setuptools
 
   run:
-    - qhull
-    - boost =1.82
-    - itk =5.3.0
-    - libitk =5.3.0
-    - libitk-devel =5.3.0
+    - vtk >=9.2.6,<9.3.0 build=*{{ build_variant }}*
+    - libitk-devel ==5.3.0
     - hdf5 >=1.14.2,<1.14.3.0a0
-    - vtk-base >=9.2.6,<9.3.0 build=*{{ build_variant }}*
-    - numpy >=1.21
-    - nibabel
-    - pandas
-    - pyvista
-    - scipy
+    - libboost-python-devel >=1.82.0,<1.83.0
+    - qhull
+    - python
+    - pip
+    - setuptools
+    - numpy
     - tqdm
-    - tslearn
     - dipy
-    - libexpat >=2.5.0,<2.6.0
-    - vtk-io-ffmpeg >=9.2.6,<9.3.0 build=*{{ build_variant }}*
+    - scipy
+    - pandas
+    - nibabel
+    - tslearn
+    - pyvista
 
 test:
-  source_files:
-    - resources/CST_R.nii.gz
   imports:
     - meta
   commands:
-    - meta --help 2>&1 || exit 1
-    - vtklevelset resources/CST_R.nii.gz CST_R.vtk 0.1 && test -f CST_R.vtk
-    - cmrep_vskel -c 3 -p 1.5 -g CST_R.vtk CST_R_skeleton.vtk && test -f CST_R_skeleton.vtk
+    - vtklevelset $PREFIX/share/meta-neuro/example/test.nii.gz test.vtk 0.1
+    - cmrep_vskel -c 3 -p 1.5 -g test.vtk test_skeleton.vtk
 
 about:
   home: https://github.com/bagari/meta
@@ -76,5 +68,7 @@ about:
 
 extra:
   bulk: true
+  additional-platforms:
+    - osx-arm64
   recipe-maintainers:
     - bagari