Skip to content

Commit 7a46e6a

Browse files
committed
Move tests section for ratter build recipe
Fix syntax in requirements generation step of GHA workflow
1 parent 798bf99 commit 7a46e6a

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

.github/workflows/stripped-install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- name: Create files containing lists of dependencies
7474
run: |
7575
python -m pip install pyyaml
76-
python utils/manage_requirements.py select --output-per-method --output-file=ci_requirements.txt --install-c=${{ matrix.install-c }} --install-fortran=${{ matrix.install.fortran }} --install-r=${{ matrix.install-r }} --install-julia=${{ matrix.install-julia }} --install-matlab=${{ matrix.install-matlab }} --install-lpy=${{ matrix.install-lpy }} --install-sbml=${{ matrix.install-sbml }} --install-pytorch=${{ matrix.install-pytorch }} --install-zmq=${{ matrix.install-zmq }} --install-mpi=${{ matrix.install-mpi }} --install-rmq=${{ matrix.install-rmq }} --install-omp=${{ matrix.install-omp }} --install-testing=true --exclude-dep=r-base ${{ matrix.python-install }}
76+
python utils/manage_requirements.py select --output-per-method --output-file=ci_requirements.txt --install-c=${{ matrix.install-c }} --install-fortran=${{ matrix.install-fortran }} --install-r=${{ matrix.install-r }} --install-julia=${{ matrix.install-julia }} --install-matlab=${{ matrix.install-matlab }} --install-lpy=${{ matrix.install-lpy }} --install-sbml=${{ matrix.install-sbml }} --install-pytorch=${{ matrix.install-pytorch }} --install-zmq=${{ matrix.install-zmq }} --install-mpi=${{ matrix.install-mpi }} --install-rmq=${{ matrix.install-rmq }} --install-omp=${{ matrix.install-omp }} --install-testing=true --exclude-dep=r-base ${{ matrix.python-install }}
7777
7878
###################################
7979
# PIP SETUP

conda.recipe/recipe.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,25 @@ outputs:
9393
- if: win
9494
then:
9595
- m2w64-crt-git
96+
tests:
97+
- python:
98+
imports:
99+
- yggdrasil
100+
- script:
101+
- yggrun -h
102+
requirements:
103+
run:
104+
- pytest
105+
- flask
106+
- ninja
107+
- cmake
108+
- ${{ stdlib('c') }}
109+
- ${{ compiler('c') }}
110+
- ${{ compiler('cxx') }}
111+
- ${{ compiler('fortran') }}
112+
files:
113+
source:
114+
- tests/
96115
- package:
97116
name: yggdrasil.c
98117
build:
@@ -382,25 +401,6 @@ outputs:
382401
run:
383402
- ${{ pin_subpackage('yggdrasil', exact=True) }}
384403
- trimesh
385-
tests:
386-
- python:
387-
imports:
388-
- yggdrasil
389-
- script:
390-
- yggrun -h
391-
requirements:
392-
run:
393-
- pytest
394-
- flask
395-
- ninja
396-
- cmake
397-
- ${{ stdlib('c') }}
398-
- ${{ compiler('c') }}
399-
- ${{ compiler('cxx') }}
400-
- ${{ compiler('fortran') }}
401-
files:
402-
source:
403-
- tests/
404404
about:
405405
homepage: https://github.com/cropsinsilico/yggdrasil
406406
repository: https://github.com/cropsinsilico/yggdrasil

utils/manage_requirements.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,8 @@ def create_rattler_recipe(self, fname=None):
507507
prev.update(**base['build'])
508508
prev['entry_points'] = load_entry_points()
509509
base['build'] = prev
510+
base['tests'] = out.pop(
511+
'tests', out['outputs'][0].get('tests', None))
510512
out['outputs'].clear()
511513
out['outputs'].append(base)
512514
for k in self.extras():

0 commit comments

Comments
 (0)