From 63f65ca24598e490315c3947cf502fb6ab2becc7 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Mon, 27 Oct 2025 14:57:48 +0100 Subject: [PATCH 01/10] add pyproject and removed setup, etc. --- CMakeLists.txt | 2 +- setup.py => bckup_setup.py | 0 conda/{bld.bat => bckup_bld.bat} | 0 conda/{build.sh => bckup_build.sh} | 0 conda/environment.yml | 10 +++ conda/meta.yaml | 7 ++- pyproject.toml | 98 ++++++++++++++++++++++++++++++ 7 files changed, 114 insertions(+), 3 deletions(-) rename setup.py => bckup_setup.py (100%) rename conda/{bld.bat => bckup_bld.bat} (100%) rename conda/{build.sh => bckup_build.sh} (100%) create mode 100644 conda/environment.yml create mode 100644 pyproject.toml diff --git a/CMakeLists.txt b/CMakeLists.txt index e29c88e7..67252b7c 100644 --- a/CMakeLists.txt +++ b/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") diff --git a/setup.py b/bckup_setup.py similarity index 100% rename from setup.py rename to bckup_setup.py diff --git a/conda/bld.bat b/conda/bckup_bld.bat similarity index 100% rename from conda/bld.bat rename to conda/bckup_bld.bat diff --git a/conda/build.sh b/conda/bckup_build.sh similarity index 100% rename from conda/build.sh rename to conda/bckup_build.sh diff --git a/conda/environment.yml b/conda/environment.yml new file mode 100644 index 00000000..29648188 --- /dev/null +++ b/conda/environment.yml @@ -0,0 +1,10 @@ +name: lpy_dev +channels: + - openalea3/label/dev + - openalea3/label/rc + - conda-forge +dependencies: + - openalea.plantgl + - pip + - pip: + - -e .."[doc, test]" diff --git a/conda/meta.yaml b/conda/meta.yaml index 006368a4..ba7ae345 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -8,20 +8,23 @@ source: path: .. about: - home: https://github.com/openalea/plantgl + home: https://github.com/openalea/lpy license: Cecill-C - summary: An open-source graphic toolkit for the creation, simulation and analysis of 3D virtual plants. + summary: Lindenmayer Systems in Python package for OpenAlea. build: string: py{{ PY_VER }} number: 0 preserve_egg_dir: True + script: + - {{ PYTHON }} -m pip install --prefix={{ PREFIX }} . --no-deps --no-build-isolation -vv requirements: host: - python - setuptools - setuptools_scm + - scikit-build-core - openalea.plantgl - boost - pyqt diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..acffc531 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,98 @@ +[build-system] +requires = ["scikit-build-core", "setuptools-scm"] +build-backend = "scikit_build_core.build" + +[project] +name = "openalea.lpy" +authors = [ + {name = "Frederic Boudon"} +] +description = "Lindenmayer Systems in Python package for OpenAlea." +requires-python = ">=3.9" +classifiers = [ + "Intended Audience :: Science/Research", + "Intended Audience :: Developers", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Scientific/Engineering", +] +license-files = ["LICEN[CS]E*", "src/cpp/LICENSE"] +# version = "1.0.2" +readme = "README.md" +dynamic = ["version"] +dependencies = [ + "pandas", + "scipy", +] + +[project.optional-dependencies] +doc = [ + "sphinx", + "sphinx-autoapi", + "sphinx-copybutton", + "nbsphinx", + "pydata-sphinx-theme", + "myst-parser", + "sphinx-favicon" +] +notebook = [ + "jupyter", + "ipywidgets" +] +test = [ + "pytest", + "pytest-cov", +] + +[tool.conda.environment] +channels = [ + "openalea3", + "conda-forge" +] +dependencies = [ + "openalea.plantgl", +] + +[tool.setuptools_scm] +# Format version to ease alignment with conda/meta.yaml tag-based versioning +fallback_version = "3.14.1.dev0" +version_scheme = "guess-next-dev" +local_scheme = "no-local-version" + +[tool.scikit-build] +metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" +build-dir="./build/{wheel_tag}" +sdist.include = ["*.so", "*.dylib", "*.dll", "*.pyd", '*.lpy','*.ui','*.qrc','*.json','*.png'] +sdist.exclude = ["*.pyc", "*.pyo"] +logging.level = "WARNING" +build.verbose = true +experimental = true + +[tool.scikit-build.cmake] +build-type="Release" +source-dir="." + +[tool.scikit-build.wheel] +packages = ["src/openalea"] + + +[project.urls] +Homepage = "https://github.com/openalea/lpy" +"Bug Tracker" = "https://github.com/openalea/lpy/issues" +Discussions = "https://github.com/openalea/lpy/discussions" +Changelog = "https://github.com/openalea/lpy/releases" + +[project.entry-points."wralea"] +"lpy" = "openalea.lpy_wralea" + +[project.entry-points."gui_scripts"] +"lpy" = "openalea.lpy.gui.lpystudio:main" + +[project.entry-points."console_scripts"] +"cpfg2lpy" = "openalea.lpy.cpfg_compat.cpfg2lpy:main" From c31e63351614fe2fb310dd8acd2f0b5096d8eae1 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Mon, 27 Oct 2025 17:50:45 +0100 Subject: [PATCH 02/10] [no ci] WIP pyproject --- CMakeLists.txt | 11 +++++------ cmake/Anaconda.cmake | 36 +++++++++++++++++++++++++++++------- pyproject.toml | 11 +++++------ 3 files changed, 39 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67252b7c..922263bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") @@ -56,14 +55,14 @@ 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) -include_directories(${Python3_INCLUDE_DIRS}) +find_package (Python COMPONENTS Interpreter Development REQUIRED) +include_directories(${Python_INCLUDE_DIRS}) # --- Libraries diff --git a/cmake/Anaconda.cmake b/cmake/Anaconda.cmake index 8932283d..b71d3229 100644 --- a/cmake/Anaconda.cmake +++ b/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,3 @@ else() message(STATUS "Install Prefix: " ${CMAKE_INSTALL_PREFIX}) endif() - diff --git a/pyproject.toml b/pyproject.toml index acffc531..ca91876d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,9 +22,9 @@ classifiers = [ "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering", ] -license-files = ["LICEN[CS]E*", "src/cpp/LICENSE"] +license-files = ["LICEN[CS]E*"] # version = "1.0.2" -readme = "README.md" +readme = "README.rst" dynamic = ["version"] dependencies = [ "pandas", @@ -67,7 +67,7 @@ local_scheme = "no-local-version" [tool.scikit-build] metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" -build-dir="./build/{wheel_tag}" +build-dir="./build/" sdist.include = ["*.so", "*.dylib", "*.dll", "*.pyd", '*.lpy','*.ui','*.qrc','*.json','*.png'] sdist.exclude = ["*.pyc", "*.pyo"] logging.level = "WARNING" @@ -78,9 +78,8 @@ experimental = true build-type="Release" source-dir="." -[tool.scikit-build.wheel] -packages = ["src/openalea"] - +[tool.scikit-build.wheel.packages] +"openalea/lpy" = "src/openalea/lpy" [project.urls] Homepage = "https://github.com/openalea/lpy" From 6959461426f1bb729dfb219cf28d6df2c7b44801 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 29 Oct 2025 15:43:42 +0100 Subject: [PATCH 03/10] conda-build locally running with test on linux --- CMakeLists.txt | 16 ++++++++-------- cmake/Anaconda.cmake | 8 ++++++++ cmake/pywrapper.cmake | 12 ++++-------- conda/meta.yaml | 1 - pyproject.toml | 4 ++-- src/cpp/CMakeLists.txt | 2 +- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 922263bf..160ef634 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,9 @@ if (WIN32) set(Python_FIND_REGISTRY LAST) endif() -find_package (Python COMPONENTS Interpreter Development REQUIRED) +set(Python_ROOT_DIR "$ENV{CONDA_PREFIX}") +find_package (Python3 COMPONENTS Interpreter Development REQUIRED) + include_directories(${Python_INCLUDE_DIRS}) # --- Libraries @@ -71,6 +73,10 @@ 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) @@ -78,12 +84,6 @@ 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) @@ -104,4 +104,4 @@ endif() add_subdirectory("src/cpp") add_subdirectory("src/wrapper") -install_share("share" "lpy") \ No newline at end of file +install_share("share" "lpy") diff --git a/cmake/Anaconda.cmake b/cmake/Anaconda.cmake index b71d3229..8187632f 100644 --- a/cmake/Anaconda.cmake +++ b/cmake/Anaconda.cmake @@ -109,3 +109,11 @@ 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() \ No newline at end of file diff --git a/cmake/pywrapper.cmake b/cmake/pywrapper.cmake index 3d1b9d9b..56bda539 100644 --- a/cmake/pywrapper.cmake +++ b/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) diff --git a/conda/meta.yaml b/conda/meta.yaml index ba7ae345..b815a07e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -41,7 +41,6 @@ requirements: - setuptools - openalea.plantgl - boost - - pyqt - ipython - qtconsole - jupyter_client # <6 diff --git a/pyproject.toml b/pyproject.toml index ca91876d..75c0551a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,8 +78,8 @@ experimental = true build-type="Release" source-dir="." -[tool.scikit-build.wheel.packages] -"openalea/lpy" = "src/openalea/lpy" +[tool.scikit-build.wheel] +packages = ["src/openalea/"] [project.urls] Homepage = "https://github.com/openalea/lpy" diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 5801c2f9..5bf65965 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -25,7 +25,7 @@ endif() # --- Output Library -install(TARGETS lpy LIBRARY DESTINATION "lib") +install_pgllib(lpy) # --- Install Headers From da340bc3ec9997d986d50c5b49e39ef9afede38b Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 30 Oct 2025 18:07:23 +0100 Subject: [PATCH 04/10] [no ci] got bin lpy in conda package --- cmake/Anaconda.cmake | 3 ++- cmake/pywrapper.cmake | 2 +- conda/meta.yaml | 2 ++ src/cpp/CMakeLists.txt | 2 +- src/openalea/lpy/gui/lpystudio.py | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/Anaconda.cmake b/cmake/Anaconda.cmake index 8187632f..f6b6036a 100644 --- a/cmake/Anaconda.cmake +++ b/cmake/Anaconda.cmake @@ -116,4 +116,5 @@ function(install_pgllib libname) LIBRARY DESTINATION "${CONDA_ENV}lib/" ARCHIVE DESTINATION "${CONDA_ENV}lib/" ) -endfunction() \ No newline at end of file +endfunction() + diff --git a/cmake/pywrapper.cmake b/cmake/pywrapper.cmake index 56bda539..31506dbe 100644 --- a/cmake/pywrapper.cmake +++ b/cmake/pywrapper.cmake @@ -31,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() diff --git a/conda/meta.yaml b/conda/meta.yaml index b815a07e..a22fa950 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -18,6 +18,8 @@ build: preserve_egg_dir: True script: - {{ PYTHON }} -m pip install --prefix={{ PREFIX }} . --no-deps --no-build-isolation -vv + entry_points: + - lpy = openalea.lpy.gui.lpystudio:main requirements: host: diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 5bf65965..6c649ad3 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -29,4 +29,4 @@ install_pgllib(lpy) # --- Install Headers -install(DIRECTORY "." DESTINATION "include/lpy" FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") +install(DIRECTORY "." DESTINATION "${CONDA_ENV}include/lpy" FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") diff --git a/src/openalea/lpy/gui/lpystudio.py b/src/openalea/lpy/gui/lpystudio.py index 412feb4e..e13836cd 100644 --- a/src/openalea/lpy/gui/lpystudio.py +++ b/src/openalea/lpy/gui/lpystudio.py @@ -1120,7 +1120,7 @@ def main(): splash.finish(w) w.splash = splash - qapp.exec_() + return qapp.exec_() if __name__ == '__main__': main() From cef2631b2abd8d40c3a7d2b6f880dcb08c9d6ef6 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 31 Oct 2025 18:17:01 +0100 Subject: [PATCH 05/10] [no ci] lpy gui working with entry added to meta.yaml --- conda/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index a22fa950..a917bad4 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -20,6 +20,7 @@ build: - {{ PYTHON }} -m pip install --prefix={{ PREFIX }} . --no-deps --no-build-isolation -vv entry_points: - lpy = openalea.lpy.gui.lpystudio:main + - cpfg2lpy = openalea.lpy.cpfg_compat.cpfg2lpy:main requirements: host: From 9baab3d537deeaf9f487c335aa790aae09876360 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 31 Oct 2025 18:17:31 +0100 Subject: [PATCH 06/10] [no ci] missing qtconsole in dependencies --- conda/environment.yml | 1 + pyproject.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/conda/environment.yml b/conda/environment.yml index 29648188..53cd7212 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -5,6 +5,7 @@ channels: - conda-forge dependencies: - openalea.plantgl + - qtconsole - pip - pip: - -e .."[doc, test]" diff --git a/pyproject.toml b/pyproject.toml index 75c0551a..c2cf4c5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,6 +57,7 @@ channels = [ ] dependencies = [ "openalea.plantgl", + "qtconsole", ] [tool.setuptools_scm] From 99982636dab1a5134fb352e4cd5d4a4da430abce Mon Sep 17 00:00:00 2001 From: baugetfa Date: Mon, 3 Nov 2025 11:24:57 +0100 Subject: [PATCH 07/10] script management --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c2cf4c5b..b3f15f99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,8 +91,6 @@ Changelog = "https://github.com/openalea/lpy/releases" [project.entry-points."wralea"] "lpy" = "openalea.lpy_wralea" -[project.entry-points."gui_scripts"] +[project.scripts] "lpy" = "openalea.lpy.gui.lpystudio:main" - -[project.entry-points."console_scripts"] "cpfg2lpy" = "openalea.lpy.cpfg_compat.cpfg2lpy:main" From dc11d0aac650c059cde0c2ebf1b257fb795f86a2 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Mon, 3 Nov 2025 18:59:30 +0100 Subject: [PATCH 08/10] removed a space after find_package --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 160ef634..404ab44e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ if (WIN32) endif() set(Python_ROOT_DIR "$ENV{CONDA_PREFIX}") -find_package (Python3 COMPONENTS Interpreter Development REQUIRED) +find_package(Python3 COMPONENTS Interpreter Development REQUIRED) include_directories(${Python_INCLUDE_DIRS}) From aac67f924dc8d867062c333fc00a8dd859407aec Mon Sep 17 00:00:00 2001 From: baugetfa Date: Tue, 4 Nov 2025 16:49:21 +0100 Subject: [PATCH 09/10] test to publish only ubuntu and windows pkg on dev --- .github/workflows/openalea_ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openalea_ci.yml b/.github/workflows/openalea_ci.yml index 3d610deb..7dea3c2a 100644 --- a/.github/workflows/openalea_ci.yml +++ b/.github/workflows/openalea_ci.yml @@ -30,4 +30,8 @@ jobs: build: uses: openalea/action-build-publish-anaconda/.github/workflows/openalea_ci.yml@main secrets: - anaconda_token: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file + anaconda_token: ${{ secrets.ANACONDA_TOKEN }} + with: + python-minor-version: "[ 13 ]" + operating-system: '["ubuntu-latest", "windows-latest"]' + build-options: "--no-test" \ No newline at end of file From 450b5b7a567b2a67fcd963bcbaeebd969d5c5748 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 5 Nov 2025 11:22:47 +0100 Subject: [PATCH 10/10] back to general CI and correction python include dir --- .github/workflows/openalea_ci.yml | 6 +----- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openalea_ci.yml b/.github/workflows/openalea_ci.yml index 7dea3c2a..3d610deb 100644 --- a/.github/workflows/openalea_ci.yml +++ b/.github/workflows/openalea_ci.yml @@ -30,8 +30,4 @@ jobs: build: uses: openalea/action-build-publish-anaconda/.github/workflows/openalea_ci.yml@main secrets: - anaconda_token: ${{ secrets.ANACONDA_TOKEN }} - with: - python-minor-version: "[ 13 ]" - operating-system: '["ubuntu-latest", "windows-latest"]' - build-options: "--no-test" \ No newline at end of file + anaconda_token: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 404ab44e..4a18a4d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ endif() set(Python_ROOT_DIR "$ENV{CONDA_PREFIX}") find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -include_directories(${Python_INCLUDE_DIRS}) +include_directories(${Python3_INCLUDE_DIRS}) # --- Libraries