merge release

.github/workflows/openalea_ci.yml

@@ -0,0 +1,33 @@
+name: OpenAlea CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+    tags:
+      - 'v*'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  release:
+    types:
+      - published
+  workflow_dispatch:
+    inputs:
+      check_before_tag:
+        description: "Run OpenAlea CI pre-tag build"
+        required: false
+        default: "true"
+        type: boolean
+
+run-name: >
+  ${{ github.event_name == 'workflow_dispatch' && 'OpenAlea CI pre-tag build' || 'OpenAlea CI' }}
+
+jobs:
+  build:
+    uses: openalea/action-build-publish-anaconda/.github/workflows/openalea_ci.yml@main
+    secrets:
+      anaconda_token: ${{ secrets.ANACONDA_TOKEN }}

.readthedocs.yaml

@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+    os: "ubuntu-22.04"
+    tools:
+        python: "mambaforge-22.9"
+
+conda:
+  environment: "doc/environment.yml"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  builder: html
+  configuration: doc/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+   install:
+     - requirements: doc/requirements.txt

CMakeLists.txt

@@ -1,6 +1,6 @@
 # --- CMake Modules
 
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include("Anaconda")
 include("pywrapper")
@@ -11,8 +11,7 @@ project(lpy_project CXX)
 
 # --- Build setup
 
-set(CMAKE_INCLUDE_PATH "$ENV{CONDA_PREFIX}/include" ${CMAKE_INCLUDE_PATH})
-set(CMAKE_LIBRARY_PATH "$ENV{CONDA_PREFIX}/lib" ${CMAKE_LIBRARY_PATH})
+
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
@@ -28,7 +27,7 @@ endif("${isSystemDir}" STREQUAL "-1")
 
 # ---  CXX11 Compilation
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
@@ -56,13 +55,15 @@ endif()
 
 # --- Python
 
-set(Python3_FIND_VIRTUALENV FIRST)
+set(Python_FIND_VIRTUALENV FIRST)
 if (WIN32)
   # needed when we run cmake in a conda environment
-  set(Python3_FIND_REGISTRY LAST)
+  set(Python_FIND_REGISTRY LAST)
 endif()
 
-find_package (Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+set(Python_ROOT_DIR "$ENV{CONDA_PREFIX}")
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+
 include_directories(${Python3_INCLUDE_DIRS})
 
 # --- Libraries
@@ -72,19 +73,17 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Concurrent)
 find_package(PlantGL REQUIRED)
 
+if(POLICY CMP0167) # Removes find boost warning
+  cmake_policy(SET CMP0167 NEW)
+endif()
+
 set(Boost_NO_SYSTEM_PATHS ON)
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS OFF)
 set(BUILD_SHARED_LIBS ON)
 
 
 set(boost_python python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-find_package(Boost 1.69 COMPONENTS system ${boost_python} REQUIRED)
-if (NOT Boost_FOUND)
-    message("Boost not found, trying again")
-    set(boost_python python)
-    find_package(Boost 1.69 COMPONENTS system ${boost_python} REQUIRED)
-endif()
 
 find_package(Boost COMPONENTS system ${boost_python} REQUIRED)
 
@@ -105,4 +104,4 @@ endif()
 add_subdirectory("src/cpp")
 add_subdirectory("src/wrapper")
 
-install_share("share" "lpy")
+install_share("share" "lpy")

README.rst

@@ -1,8 +1,8 @@
 .. image:: https://img.shields.io/badge/License-GPL-blue.svg
    :target: https://opensource.org/licenses/GPL-3.0
 
-.. image:: https://github.com/openalea/lpy/actions/workflows/conda-package-build.yml/badge.svg
-    :target: https://github.com/openalea/lpy/actions/workflows/conda-package-build.yml
+.. image:: https://github.com/openalea/lpy/actions/workflows/openalea_ci.yml/badge.svg
+    :target: https://github.com/openalea/lpy/actions/workflows/openalea_ci.yml
     :alt: Github Actions Continuous Integration Status
 
 .. image:: https://ci.appveyor.com/api/projects/status/8bd8xhc9wy0bee0k/branch/master?svg=true
@@ -52,9 +52,9 @@ To install L-Py, you need to create an environment (named for instance lpy) :
 
 .. code-block:: bash
 
-        >>> conda create -n lpy openalea.lpy -c fredboudon -c conda-forge
+        >>> conda create -n lpy openalea.lpy -c openalea3 -c conda-forge
 
-The package ``openalea.lpy`` is retrieved from the ``fredboudon`` channel (developement) and its dependencies will be taken from ``conda-forge`` channel.
+The package ``openalea.lpy`` is retrieved from the ``openalea3`` channel (developement) and its dependencies will be taken from ``conda-forge`` channel.
 
 Then, you need to activate the L-Py environment
 
@@ -74,9 +74,6 @@ Documentation
 
 Documentation is available at `<http://lpy.readthedocs.io/en/latest/>`_
 
-
-A previous version of the documentation was also available on  `OpenAlea website <http://openalea.gforge.inria.fr/dokuwiki/doku.php?id=packages:vplants:lpy:main>`_
-
 Help and Support
 ----------------
 

build.sh

@@ -1 +1 @@
-conda mambabuild . -c conda-forge -c fredboudon  --python=3.10 --no-test
+conda mambabuild . -c conda-forge -c openalea3/label/dev -c openalea3/label/rc -c openalea3  --python=3.13 --no-test

cmake/Anaconda.cmake

@@ -2,14 +2,16 @@
 if (DEFINED ENV{CONDA_PREFIX})
     # Anaconda Environment
     message(STATUS "Anaconda environment detected: " $ENV{CONDA_PREFIX})
-
-
+
+    set(CMAKE_INCLUDE_PATH "$ENV{CONDA_PREFIX}/include" ${CMAKE_INCLUDE_PATH})
+    set(CMAKE_LIBRARY_PATH "$ENV{CONDA_PREFIX}/lib" ${CMAKE_LIBRARY_PATH})
+
     if (DEFINED ENV{PREFIX})
         file(TO_CMAKE_PATH $ENV{PREFIX} TMP_CONDA_ENV)
     else()
         file(TO_CMAKE_PATH $ENV{CONDA_PREFIX} TMP_CONDA_ENV)
     endif()
-    
+
     if (WIN32)
         set(CONDA_ENV "${TMP_CONDA_ENV}/Library/")
     else()
@@ -45,15 +47,36 @@ if (DEFINED ENV{CONDA_BUILD})
     if (APPLE)
         set(CMAKE_OSX_ARCHITECTURES $ENV{OSX_ARCH})
     endif()
-   
+
     set(CMAKE_CXX_COMPILER $ENV{CXX})
     set(CMAKE_CXX_COMPILER_RANLIB $ENV{RANLIB})
     set(CMAKE_CXX_COMPILER_AR $ENV{AR})
 
     # where is the target environment
-    set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot $ENV{CONDA_BUILD_SYSROOT})
+    set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX})
+    if (APPLE)
+        list(APPEND CMAKE_FIND_ROOT_PATH $ENV{CONDA_BUILD_SYSROOT} )
+    endif()
+    if (WIN32)
+        list(APPEND CMAKE_FIND_ROOT_PATH $ENV{BUILD_PREFIX}/Library/usr $ENV{PREFIX}/Library/usr)
+        set(CMAKE_INCLUDE_PATH "$ENV{BUILD_PREFIX}/Library/usr/include" ${CMAKE_INCLUDE_PATH})
+        set(CMAKE_LIBRARY_PATH "$ENV{BUILD_PREFIX}/Library/usr/lib" ${CMAKE_LIBRARY_PATH})
+    endif()
+    if (UNIX)
+        # I add both old stype and new style cdts : https://github.com/conda-forge/cdt-builds#old-stylelegacy-vs-new-style-cdts
+        list(APPEND CMAKE_FIND_ROOT_PATH $ENV{BUILD_PREFIX}/x86_64-conda-linux-gnu/sysroot $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot )
+        list(APPEND CMAKE_FIND_ROOT_PATH $ENV{PREFIX}/x86_64-conda-linux-gnu/sysroot $ENV{PREFIX}/$ENV{HOST}/sysroot )
+
+        link_directories($ENV{BUILD_PREFIX}/x86_64-conda-linux-gnu/sysroot/lib64 $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot/lib64)
+        link_directories($ENV{BUILD_PREFIX}/x86_64-conda-linux-gnu/sysroot/lib $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot/lib)
+        link_directories($ENV{BUILD_PREFIX}/x86_64-conda-linux-gnu/sysroot/usr/lib64 $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot/usr/lib64)
+        link_directories($ENV{BUILD_PREFIX}/x86_64-conda-linux-gnu/sysroot/usr/lib $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot/usr/lib)
+    endif()
 
-    message("CMAKE_FIND_ROOT_PATH :" ${CMAKE_FIND_ROOT_PATH})
+    message(STATUS "CMAKE_FIND_ROOT_PATH :")
+    foreach(dir ${CMAKE_FIND_ROOT_PATH})
+        message(STATUS " - " ${dir})
+    endforeach()
 
     # search for programs in the build host directories
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
@@ -86,4 +109,12 @@ else()
     message(STATUS "Install Prefix: " ${CMAKE_INSTALL_PREFIX})
 endif()
 
+function(install_pgllib libname)
+    message("Installing ${libname} in ${CONDA_ENV}lib/")
+    install(TARGETS ${libname}
+            RUNTIME DESTINATION "${CONDA_ENV}bin/"
+            LIBRARY DESTINATION "${CONDA_ENV}lib/"
+            ARCHIVE DESTINATION "${CONDA_ENV}lib/"
+     )
+endfunction()
 

cmake/pywrapper.cmake

@@ -1,15 +1,11 @@
 
 
 function(pgllib_link_python libwrapname)
-    if(NOT APPLE OR NOT USE_CONDA)
-        if (Python3_FOUND)
-             target_link_libraries(${libwrapname} Python3::Python)
-        elseif (Python2_FOUND)
-            target_link_libraries(${libwrapname} Python2::Python)
+        if (APPLE)
+            target_link_libraries(${libwrapname} "-undefined dynamic_lookup")
+        else()
+            target_link_libraries(${libwrapname} Python3::Python)
         endif()
-    else()
-        message(STATUS "Do not link with Python directly : " ${libwrapname})
-    endif()
 endfunction()
 
 function(pgllib_link_boost libwrapname)
@@ -35,5 +31,5 @@ function(pglwrapper_install libwrapname)
 endfunction()
 
 function(install_share sharedirectory project)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${sharedirectory}/ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/${project}")
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${sharedirectory}/ DESTINATION "${CONDA_ENV}/share/${project}")
 endfunction()