Merge pull request #35 from pradal/namespace

Namespace

Author: pradal

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

@@ -1,67 +1,20 @@
-name: build_publish_anaconda
+name: Building Package
 
 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: true
-        python: ${{ matrix.python-minor-version }}
-        numpy: '20'
-        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
+    with:
+      conda-channels: openalea3, conda-forge
+    secrets: 
+      anaconda_token: ${{ secrets.ANACONDA_TOKEN }}

setup.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
-__revision__ = "$Id$"
+ # -*- coding: utf-8 -*-
 
 import sys
 from os.path import join as pj
 
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 # find version number in src/openalea/core/version.py
 _version = {}
@@ -26,7 +25,7 @@
 
 
 namespace = 'openalea'
-packages = find_packages('src')
+packages = find_namespace_packages(where='src', include=['openalea.*'])
 package_dir = {'': 'src'}
 
 setup(

src/openalea/__init__.py

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