Merge pull request #30 from openalea/namespace

New namespaces

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

@@ -2,66 +2,17 @@ name: build_publish_anaconda
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - '**'
+    tags:
+      - 'v*'
   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            
+    branches:
+      - '**'
+
 
-    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
+jobs:
+  build:
+    uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main
+    secrets:
+      anaconda_token: ${{ secrets.ANACONDA_TOKEN }}

setup.py

@@ -3,7 +3,7 @@
 
 # format setup arguments
 
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 from io import open
 
 
@@ -19,7 +19,7 @@
     version = _version["__version__"]
 
 # find packages
-pkgs = find_packages('src')
+pkgs = find_namespace_packages('src', include=['openalea.*'])
 
 setup_kwds = dict(
     name='openalea.core',
@@ -29,7 +29,7 @@
     author="Christophe Pradal",
     author_email="christophe dot pradal at cirad dot fr",
     url='https://github.com/openalea/core',
-    license='cecill-c',
+    license='CeCILL-C',
     zip_safe=False,
 
     packages=pkgs,

src/openalea/core/version.py

@@ -8,10 +8,10 @@
 MAJOR = 2
 """(int) Version major component."""
 
-MINOR = 3
+MINOR = 4
 """(int) Version minor component."""
 
-POST = 1
+POST = 0
 """(int) Version post or bugfix component."""
 
 __version__ = ".".join([str(s) for s in (MAJOR, MINOR, POST)])