Merge pull request #13 from pradal/namespace

Namespace

.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/[email protected]
-      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

@@ -4,7 +4,7 @@
 import sys
 import os
 
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 name = "OpenAlea.GraphEditor"
 description= "GraphEditor package for OpenAlea."
@@ -22,13 +22,10 @@
     version = _version["__version__"]
 
 namespace = 'openalea'
-packages=find_packages('src')
+packages = find_namespace_packages(where='src', include=['openalea.*'])
 package_dir={'': 'src'}
 
 setup_requires = ['openalea.deploy']
-install_requires = []
-# web sites where to find eggs
-dependency_links = []
 
 # setup function call
 #
@@ -56,8 +53,6 @@
 
     # Dependencies
     setup_requires=setup_requires,
-    install_requires=install_requires,
-    dependency_links=dependency_links,
 
     include_package_data=True,
 )

src/openalea/grapheditor/version.py

@@ -5,7 +5,7 @@
 MAJOR = 2
 """(int) Version major component."""
 
-MINOR = 2
+MINOR = 4
 """(int) Version minor component."""
 
 POST = 0