Skip to content

Commit 39ca23c

Browse files
authored
Merge pull request #14 from openalea/refactor
Refactor
2 parents 6d88fd5 + 0e8c0b8 commit 39ca23c

19 files changed

Lines changed: 1667 additions & 897 deletions

.github/workflows/conda-package-build.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/workflows/openalea_ci.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: OpenAlea CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
tags:
9+
- 'v*'
10+
pull_request:
11+
types:
12+
- opened
13+
- synchronize
14+
- reopened
15+
release:
16+
types:
17+
- published
18+
workflow_dispatch:
19+
inputs:
20+
check_before_tag:
21+
description: "Run OpenAlea CI pre-tag build"
22+
required: false
23+
default: "true"
24+
type: boolean
25+
26+
run-name: >
27+
${{ github.event_name == 'workflow_dispatch' && 'OpenAlea CI pre-tag build' || 'OpenAlea CI' }}
28+
29+
jobs:
30+
build:
31+
uses: openalea/action-build-publish-anaconda/.github/workflows/openalea_ci.yml@main
32+
secrets:
33+
anaconda_token: ${{ secrets.ANACONDA_TOKEN }}

conda/meta.yaml

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,57 @@
1-
{% set data = load_setup_py_data() %}
1+
{% set pyproject = load_file_data('../pyproject.toml', from_recipe_dir=True) %}
2+
{% set name = pyproject.get('project').get('name') %}
3+
{% set description = pyproject.get('project').get('description') %}
4+
{% set version = environ.get('SETUPTOOLS_SCM_PRETEND_VERSION', "1.0.0.dev") %}
5+
{% set license = pyproject.get('project').get('license') %}
6+
{% set home = pyproject.get('project', {}).get('urls', {}).get('Homepage', '') %}
7+
{% set build_deps = pyproject.get("build-system", {}).get("requires", []) %}
8+
{% set deps = pyproject.get('project', {}).get('dependencies', []) %}
9+
{% set conda_deps = pyproject.get('tool', {}).get('conda', {}).get('environment', {}).get('dependencies',[]) %}
10+
{% set test_deps = pyproject.get('project', {}).get('optional-dependencies', {}).get('test',[]) %}
11+
212

313
package:
4-
name: openalea.dss
5-
version: {{ data.get('version') }}
14+
name: {{ name }}
15+
version: {{ version }}
616

717
source:
818
path: ..
919

1020
build:
1121
noarch: python
12-
preserve_egg_dir: True
1322
number: 0
14-
script: {{PYTHON}} setup.py install
23+
preserve_egg_dir: True
24+
script:
25+
- {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv
1526

1627
requirements:
17-
build:
18-
- python {{PY_VER}}
19-
- setuptools
28+
host:
29+
- python
30+
{% for dep in build_deps %}
31+
- {{ dep }}
32+
{% endfor %}
33+
2034
run:
21-
- python >=3.6
22-
- agroservices
23-
- weatherdata
24-
- matplotlib
35+
- python
36+
{% for dep in deps + conda_deps %}
37+
- {{ dep }}
38+
{% endfor %}
2539

2640
test:
2741
requires:
28-
- pytest
42+
{% for dep in test_deps %}
43+
- {{ dep }}
44+
{% endfor %}
2945
imports:
30-
- weatherdata
46+
- openalea.dss
3147
source_files:
3248
- test/**
33-
#commands:
34-
# - cd test
35-
# - pytest -v --ignore=test_weatherdata.py
49+
3650
about:
37-
home: {{ data.get('url') }}
38-
license: GPL-v3
39-
summary: {{ data.get('description') }}
51+
home: {{ home }}
52+
summary: {{ description }}
53+
license: {{ license }}
4054

55+
extra:
56+
recipe-maintainers:
57+
- pradal

doc/requierements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
python=3.8
2-
openalea.deploy
32
agroservices
43
requests (agroservices)
54
appdirs (agroservices)

0 commit comments

Comments
 (0)