Skip to content

Commit

Permalink
Update pyopenms to 3.2.0 (#51753)
Browse files Browse the repository at this point in the history
* bump version

* add eigen to build,host,run

* bump eigen version

* Bump eigen >= 3.4.0

* exchange to eigen3 package

* Try upstream fix of openms to find eigen -> update checksum

* fix eigen to 3.3.4

* fix eigen to 3.3.5

* Relax eigen version pin

* Update conda_build_config.yaml

* Update conda_build_config.yaml

* Update packages in pyopenms recipe

* Remove duplicated eigen dependency and remove trailing spaces

* Update recipes/pyopenms/meta.yaml

Co-authored-by: Björn Grüning <[email protected]>

* Update recipes/pyopenms/meta.yaml

Co-authored-by: Björn Grüning <[email protected]>

* Move eigen to host section

---------

Co-authored-by: Jonas Scheid <[email protected]>
Co-authored-by: Björn Grüning <[email protected]>
  • Loading branch information
3 people authored Oct 29, 2024
1 parent 0307b27 commit 1d9feae
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 113 deletions.
104 changes: 0 additions & 104 deletions recipes/pyopenms/build_failure.linux-64.yaml

This file was deleted.

5 changes: 4 additions & 1 deletion recipes/pyopenms/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ python:
- 3.9.*
- 3.10.*
- 3.11.*
- 3.12.*
python_impl:
- cpython
- cpython
- cpython
- cpython
numpy:
- 1.23.*
- 1.23.*
- 1.23.*
- 1.23.*
- 1.26.*
zip_keys:
- python
- python_impl
Expand Down
19 changes: 11 additions & 8 deletions recipes/pyopenms/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "pyopenms" %}
{% set version = "3.1.0" %} # if ends with 'dev' it is considered a development release and pulled from GitHub
{% set version = "3.2.0" %} # if ends with 'dev' it is considered a development release and pulled from GitHub
package:
name: {{ name|lower }}
version: {{ version }}
Expand All @@ -11,8 +11,8 @@ source:
git_depth: 1 # (Defaults to -1/not shallow)
{% else %}
source:
url: https://github.com/OpenMS/OpenMS/releases/download/Release{{ version }}/OpenMS-{{ version }}-src.tar.gz
md5: 6a60ef1a95c7ce915cc3a02e5bccd593
url: https://github.com/OpenMS/OpenMS/releases/download/release%2F3.2.0/OpenMS-3.2.tar.gz # since we discarded the trailing 0 during the GHA we have to hard code this, fix it next release
md5: e15b34a4ccaf7070d186fd01a6d57f3e
{% endif %}

build:
Expand All @@ -26,14 +26,15 @@ requirements:
- {{ compiler('cxx') }}
- make
- cmake
- sysroot_linux-64 =2.17 # [linux]
- sysroot_linux-64 =2.17 # [linux]
host:
- libopenms {{ version }}
- eigen >=3.3.4
- libopenms >={{ version }}
- llvm-openmp # [osx]
- libsvm
- xerces-c
- boost-cpp
- qt-main
- qt-main >=5.15.8
- python {{ python }}
- cython >=0.25.2
- autowrap >=0.22.10
Expand All @@ -44,13 +45,15 @@ requirements:
- pandas
- matplotlib-base
- sysroot_linux-64 =2.17 # [linux]
- icu >=73.2,<74.0a0
run: # run_exports in libopenms should take care of the libraries. But it does not because of bugs. So copy everthing again and again
- libopenms {{ version }}
- libopenms >={{ version }}
- llvm-openmp # [osx]
- libsvm
- xerces-c
- boost-cpp
- qt-main
- qt-main >=5.15.8
- eigen >=3.3.4
- python {{ python }}
- numpy {{ numpy }}
- pandas
Expand Down

0 comments on commit 1d9feae

Please sign in to comment.