Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ build:
noarch: python
preserve_egg_dir: True
number: 0
string: py{{ PY_VER }}
script: {{PYTHON}} -m pip install . -vv
script: {{PYTHON}} -m pip install --no-deps --no-build-isolation . -vv

requirements:
build:
Expand All @@ -37,7 +36,7 @@ requirements:

test:
requires:
{% for dep in deps + conda_deps + test_deps %}
{% for dep in test_deps %}
- {{ dep }}
{% endfor %}
imports:
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ dynamic = ["readme","version"]
dependencies = [
"numpy",
"scipy",
"matplotlib-base",
"pandas",
"rpy2"
]

[project.optional-dependencies]
Expand All @@ -60,7 +60,7 @@ dependencies = [
"openalea.plantgl",
"openalea.caribu",
"openalea.astk",
"rpy2"
"matplotlib-base"
]
[tool.setuptools.dynamic]
readme = {file = ["README.md"]}
Expand Down
15 changes: 15 additions & 0 deletions test/test_AdelWheat.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
import pytest

try:
# test if R's stats package loads correctly
import rpy2.robjects as ro
ro.r("na.omit") # will error on broken R
r_ok = True
except Exception:
r_ok = False

pytestmark = pytest.mark.skipif(
not r_ok,
reason="Skipping R tests on Windows CI due to broken R installation"
)

from openalea.adel.astk_interface import AdelWheat
from openalea.astk.Weather import sample_weather

Expand Down
17 changes: 17 additions & 0 deletions test/test_Adel_Maxwell_plante11.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
"""Test stability of Adel for simulating a reference plant (Maxwell, plant 11, pareameterised by M. Abichou/B.Andrieu, EGC Grignon"""
import pytest

try:
# test if R's stats package loads correctly
import rpy2.robjects as ro
ro.r("na.omit") # will error on broken R
r_ok = True
except Exception:
r_ok = False

pytestmark = pytest.mark.skipif(
not r_ok,
reason="Skipping R tests on Windows CI due to broken R installation"
)



import pathlib
from functools import reduce

Expand Down
13 changes: 13 additions & 0 deletions test/test_adelwheat_dynamic.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
"""Test use cases of adel/fspm wheat coupling"""
import pytest

try:
# test if R's stats package loads correctly
import rpy2.robjects as ro
ro.r("na.omit") # will error on broken R
r_ok = True
except Exception:
r_ok = False

pytestmark = pytest.mark.skipif(
not r_ok,
reason="Skipping R tests on Windows CI due to broken R installation"
)
from openalea.adel.adelwheat_dynamic import AdelWheatDyn


Expand Down
15 changes: 15 additions & 0 deletions test/test_astk_interface.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
import pytest

try:
# test if R's stats package loads correctly
import rpy2.robjects as ro
ro.r("na.omit") # will error on broken R
r_ok = True
except Exception:
r_ok = False

pytestmark = pytest.mark.skipif(
not r_ok,
reason="Skipping R tests on Windows CI due to broken R installation"
)

from openalea.adel.astk_interface import AdelWheat


Expand Down
16 changes: 16 additions & 0 deletions test/test_data_samples.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
import sys
import pytest

try:
# test if R's stats package loads correctly
import rpy2.robjects as ro
ro.r("na.omit") # will error on broken R
r_ok = True
except Exception:
r_ok = False

pytestmark = pytest.mark.skipif(
not r_ok,
reason="Skipping R tests on Windows CI due to broken R installation"
)

from openalea.adel.data_samples import *


Expand Down
Loading