Merge branch 'master' of https://github.com/openalea/openalea-components

openalea · Jan 23, 2024 · 8f4a49e · 8f4a49e
2 parents e165050 + 294beb5
commit 8f4a49e
Show file tree

Hide file tree

Showing 194 changed files with 11,761 additions and 9,358 deletions.
diff --git a/.github/workflows/conda-numpy-build.yml b/.github/workflows/conda-numpy-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/[email protected]
+      with:
+        conda: numpy/conda
+        mamba: true
+        python: ${{ matrix.python-minor-version }}
+        numpy: '20'
+        channels: openalea3, conda-forge
+        token: ${{ secrets.ANACONDA_TOKEN }}
+        publish: ${{ steps.publish.outputs.value }}
+        label: main
diff --git a/.github/workflows/conda-pylab-build.yml b/.github/workflows/conda-pylab-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/[email protected]
+      with:
+        conda: pylab/conda
+        mamba: true
+        python: ${{ matrix.python-minor-version }}
+        numpy: '20'
+        channels: openalea3, conda-forge
+        token: ${{ secrets.ANACONDA_TOKEN }}
+        publish: ${{ steps.publish.outputs.value }}
+        label: main
diff --git a/.github/workflows/conda-stdlib-build.yml b/.github/workflows/conda-stdlib-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/[email protected]
+      with:
+        conda: stdlib/conda
+        mamba: true
+        python: ${{ matrix.python-minor-version }}
+        numpy: '20'
+        channels: openalea3, conda-forge
+        token: ${{ secrets.ANACONDA_TOKEN }}
+        publish: ${{ steps.publish.outputs.value }}
+        label: main
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,71 @@
-*.pyc
+# Python files
+*.py[cod]
+
+# C extensions
+*.so
+*.dll
+*.dylib
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# Compiled Object files
+*.os
+
+# 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
+.amlog
+.sconsign.dblite
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Designer files
+*visualea/src/visualea/ui_*
+
+# Translations
+*.mo
+
+# Vim files
+*.swp
 *.*~
-.svn
-.idea
+
+# Mr Developer
+.mr.developer.cfg
 .project
 .pydevproject
 .settings
+.idea
+
+# svn
+.svn
+
+# temporary files
+*._icon.png
 
+# Mac dirs
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/dtk/src/dtk_wralea/py_dtk.py b/dtk/src/dtk_wralea/py_dtk.py
@@ -13,19 +13,19 @@
 #       OpenAlea WebSite : http://openalea.gforge.inria.fr
 #
 
-dtkCorePath = "/home/pradal/local/inria/modules"
+#dtkCorePath = "/home/pradal/local/inria/modules"
 
 import os
-dtkPath = os.getenv('DTKPYTHONPATH',dtkCorePath)
+#dtkPath = os.getenv('DTKPYTHONPATH',dtkCorePath)
 
-try:
-    sys.path.insert(0, dtkPath)
-    del sys.modules['core']
-    del core
-except: pass
+#try:
+#    sys.path.insert(0, dtkPath)
+#    del sys.modules['core']
+#    del core
+#except: pass
 
-from openalea.vpltk.qt import QtCore, QtGui
-import core
+from qtpy import QtWidgets
+import dtkcore as core
 import sip
 
 from openalea.core import *
@@ -109,14 +109,14 @@ def __call__(self, inputs):
                 properties = input['properties']
                 interactor = method(name)
 
-                for p, k in properties.iteritems():
+                for p, k in properties.items():
                     interactor.setProperty(p, k)
 
         self.dtk_factory.update()
         self.dtk_factory.reset()
 
         widget = self.dtk_factory.widget()
-        widget = sip.wrapinstance(widget.__long__(), QtGui.QWidget)
+        widget = sip.wrapinstance(widget.__long__(), QtWidgets.QWidget)
         widget.show()