Merge pull request #18 from regro-cf-autotick-bot/4.3.1_h6c7453

conda-forge · Jun 13, 2024 · 68233f5 · 68233f5
2 parents 5e51865 + a62bc95
commit 68233f5
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 40 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/0001-Patch-pyproject.patch b/recipe/0001-Patch-pyproject.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index cea2dd06..2e07f14c 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -21,7 +21,6 @@ dependencies = [
+     "scikit-learn",
+     "dask",
+     "dask-jobqueue",
+-    "opencv-python",
+     "xarray >= 2022.11.0",
+     "statsmodels",
+     "altair",
diff --git a/recipe/0001-Patch-requirements-and-setup.patch b/recipe/0001-Patch-requirements-and-setup.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "plantcv" %}
-{% set version = "4.2.1" %}
+{% set version = "4.3.1" %}
 
 
 package:
@@ -8,9 +8,9 @@ package:
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 2ab7c0910c7873093cfb73d2422e8a9df3aaf44a6f4b350cbf74f9ab7291e5b8
+  sha256: 723b5c5e4d5e0cf786fc8ca50214a629150746c29c3b93248a99c3fe55c03211
   patches:
-    - 0001-Patch-requirements-and-setup.patch
+    - 0001-Patch-pyproject.patch
 
 build:
   number: 0
@@ -49,6 +49,7 @@ test:
     - pip check
   requires:
     - pip
+    - libopencv *=headless*
 
 about:
   home: https://plantcv.org

diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt
@@ -1,6 +1,5 @@
 mesa-libGL
-mesa-dri-drivers
-libselinux
-libXdamage
-libXxf86vm
-libXext
+mesa-libEGL
+libglvnd-egl
+libglvnd-glx
+libglvnd-opengl