Skip to content

Commit

Permalink
Add C compiler (fixing macos error?); add additional platforms; add d…
Browse files Browse the repository at this point in the history
…otnet runtime dep; cleanup build script
  • Loading branch information
RalfG committed Jan 16, 2025
1 parent bd77758 commit ddab219
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 117 deletions.
14 changes: 3 additions & 11 deletions recipes/ms2rescore-rs/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@
# -x = print every executed command
set -ex

# Add workaround for SSH-based Git connections from Rust/cargo. See https://github.com/rust-lang/cargo/issues/2078 for details.
# We set CARGO_HOME because we don't pass on HOME to conda-build, thus rendering the default "${HOME}/.cargo" defunct.
export CARGO_NET_GIT_FETCH_WITH_CLI=true CARGO_HOME="${BUILD_PREFIX}/.cargo"

# Use a custom temporary directory as home on macOS.
# (not sure why this is useful, but people use it in bioconda recipes)
if [ `uname` == Darwin ]; then
export HOME=`mktemp -d`
fi
export RUST_BACKTRACE=1

# Build the package using maturin - should produce *.whl files.
maturin build --interpreter $PYTHON --release --manylinux off
maturin build --interpreter "${PYTHON}" -b pyo3 --release --strip --manylinux off

# Install *.whl files using pip
$PYTHON -m pip install target/wheels/*.whl --no-deps --ignore-installed -vv
${PYTHON} -m pip install target/wheels/*.whl --no-deps --no-build-isolation --no-cache-dir -vv
106 changes: 0 additions & 106 deletions recipes/ms2rescore-rs/build_failure.osx-64.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions recipes/ms2rescore-rs/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ build:

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('rust') }}
- make
Expand All @@ -29,6 +30,7 @@ requirements:
- pip
run:
- python
- dotnet-runtime =6.0 # For Thermo Raw support

test:
imports:
Expand All @@ -45,6 +47,9 @@ about:
license_file: LICENSE

extra:
additional-platforms:
- linux-aarch64
- osx-arm64
recipe-maintainers:
- CompOmics
- RalfG

0 comments on commit ddab219

Please sign in to comment.