Merge branch 'master' into pmanager

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

@@ -0,0 +1,67 @@
+name: build_publish_anaconda
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-and-publish:
+    name: ${{ matrix.os }}, Python 3.${{ matrix.python-minor-version }} for conda deployment
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      max-parallel: 3
+      matrix:
+        os: [ ubuntu-latest]
+        python-minor-version: [9]
+        isMaster:
+          - ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/dev') }}
+        exclude:
+          - isMaster: false
+            os: ubuntu-latest
+            python-minor-version: 7
+          - isMaster: false
+            os: ubuntu-latest
+            python-minor-version: 8
+          - isMaster: false
+            os: macos-latest
+            python-minor-version: 7
+          - isMaster: false
+            os: macos-latest
+            python-minor-version: 8
+          - isMaster: false
+            os: macos-latest
+            python-minor-version: 9
+          - isMaster: false
+            os: windows-latest
+            python-minor-version: 7
+          - isMaster: false
+            os: windows-latest
+            python-minor-version: 8
+          - isMaster: false
+            os: windows-latest
+            python-minor-version: 9            
+
+    steps:
+    - name: Chekout
+      uses: actions/checkout@v3
+    - name: Determine publish
+      uses: haya14busa/action-cond@v1
+      id: publish
+      with:
+        cond: ${{ contains(github.ref, 'master') || startsWith(github.ref, 'refs/heads/v') }}
+        if_true: 'true'
+        if_false: 'false'
+    - name: Build and Publish
+      uses: openalea/action-build-publish-anaconda@v0.1.4
+      with:
+        conda: conda
+        mamba: false
+        python: ${{ matrix.python-minor-version }}
+        numpy: '20.0'
+        channels: openalea3, conda-forge
+        token: ${{ secrets.ANACONDA_TOKEN }}
+        publish: ${{ steps.publish.outputs.value }}
+        label: main

.gitignore

@@ -1,45 +1,6 @@
-# {# pkglts, git
-# Byte-compiled / optimized / DLL files
-__pycache__/
+# Python files
 *.py[cod]
 
-# pkglts files
-.pkglts/info.log*
-
-# Packages
-*.egg
-*.egg-info
-.eggs
-.Python
-*.pth
-dist/
-build/
-env/
-downloads/
-eggs/
-parts/
-bin/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-lib/
-lib64/
-
-# editors
-.idea/
-
-# Vim files
-*.swp
-*.*~
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-.settings
-
-
 # C extensions
 *.so
 *.dll
@@ -53,43 +14,58 @@ lib64/
 # Compiled Object files
 *.os
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
+# Packages
+*.egg
+*.egg-info
+dist
+build
+build-scons
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+__pycache__
+*.pth
+*.bak
 
 # Installer logs
 pip-log.txt
-pip-delete-this-directory.txt
 .amlog
 .sconsign.dblite
 
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Designer files
+*visualea/src/visualea/ui_*
+
 # Translations
 *.mo
-*.pot
-
-# Django stuff:
-*.log
 
-# PyBuilder
-target/
+# Vim files
+*.swp
+*.*~
 
-# jupyter notebooks
-.ipynb_checkpoints/
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+.settings
+.idea
 
 # svn
 .svn
-.cache/
-
-# coverage
-.coverage
-
-# sphinx autogen file
-doc/_dvlpt/
-
-
-# #}
 
-# user custom filters
+# temporary files
+*._icon.png
 
+# Mac dirs
+.DS_Store

conda/meta.yaml

@@ -1,38 +1,45 @@
-{% set version = "2.0.1" %}
+{% set data = load_setup_py_data() %}
 
 package:
   name: openalea.core
-  version: {{ version }}
+  version: {{ data.get('version') }}
 
 source:
   path: ..
 
 build:
+  noarch: python
   preserve_egg_dir: True
-  number: 1
-  script: python setup.py install --prefix=$PREFIX
+  number: 0
+  script: {{PYTHON}} setup.py install 
 
 requirements:
   build:
-    - openalea.deploy #==2.0.0
+    - python {{PY_VER}}
+    - setuptools
+    - openalea.deploy
+    - six
   run:
-    - python
+    - python  <3.11
     - ipykernel
+    - configobj
+    - six
 
 test:
   imports:
     - openalea.core
   requires:
-    - nose
+    - pytest
   source_files:
     - test/
     - test/*.py
 
   commands:
-    - nosetests -v -I test_compositenode.py -I test_alias.py -I test_data.py -I test_eval.py -I test_package.py
+    - cd test
+    - pytest -v test_*.py
 
 about:
-  home: http://github.com/openalea/core
+  home: {{ data.get('url') }}
   license: Cecill-c License
-  summary: OpenAlea Core component and Scientific Workflow platform.
+  summary: {{ data.get('description') }}
 

doc/_dvlpt/modules.rst

@@ -0,0 +1,7 @@
+src
+===
+
+.. toctree::
+   :maxdepth: 4
+
+   openalea

doc/_dvlpt/openalea.core.algo.rst

@@ -0,0 +1,30 @@
+openalea.core.algo package
+==========================
+
+Submodules
+----------
+
+openalea.core.algo.dataflow\_copy module
+----------------------------------------
+
+.. automodule:: openalea.core.algo.dataflow_copy
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+openalea.core.algo.dataflow\_evaluation module
+----------------------------------------------
+
+.. automodule:: openalea.core.algo.dataflow_evaluation
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: openalea.core.algo
+    :members:
+    :undoc-members:
+    :show-inheritance: