Merge pull request #61 from openalea/master

Sync with openalea
openalea · Jan 23, 2024 · b2df121 · b2df121
2 parents 0e77c8a + b1a5a04
commit b2df121
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/conda-package-build.yml
@@ -14,5 +14,7 @@ on:
 jobs:
   build:
     uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main
+    with:
+      conda-channels: openalea3, conda-forge
     secrets: 
-      token: ${{ secrets.ANACONDA_TOKEN }}
+      anaconda_token: ${{ secrets.ANACONDA_TOKEN }}
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@ def getMetaInfo():
 
 globals().update(getMetaInfo())
 
-namepace = 'openalea'
+namespace = 'openalea'
 
 # Setup script
 version = HexVersion.from_cpp_define('PGL_VERSION',pj('src','cpp','plantgl','version.h')).to_string()
@@ -35,7 +35,7 @@ def getMetaInfo():
         inc_dirs = { 'include' : pj(currentdir, build_prefix, 'include') },
         share_dirs = { 'share' : 'share'},
         postinstall_scripts = ['pgl_postinstall',],
-        namespace_packages = [namespace],
+        #namespace_packages = [namespace],
         create_namespaces = False,
     )
 
@@ -53,7 +53,6 @@ def getMetaInfo():
     # pure python packages
     #packages = find_namespace_packages(where='src',include=['openalea','openalea.*'])
     packages = [ 
-        namepace,
         pkg_name, 
         pkg_name + '.math', 
         pkg_name + '.scenegraph',