From e948a00bf34f7e3f56e641d0ab872fb489d5b572 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 12:12:08 +0200 Subject: [PATCH 1/2] removed compiler in meta.yaml --- conda/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 78a8662..545ad8b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -31,9 +31,6 @@ requirements: - {{ dep }} {% endfor %} - build: - - {{ compiler("cxx") }} - run: - python {% for dep in deps + conda_deps %} From 6e0ba2827ac4972aabf362a6feb7809e30153ce4 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 12:15:49 +0200 Subject: [PATCH 2/2] matplotlib-base updated tool setuptools_scm in pyproject --- conda/environment.yml | 5 +++-- pyproject.toml | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/conda/environment.yml b/conda/environment.yml index 3664aef..bbc15c8 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - openalea3 dependencies: - - matplotlib + - matplotlib-base - pandas - xlsxwriter - path @@ -11,4 +11,5 @@ dependencies: - openalea.mtg # let pip install the rest using pyproject.toml (if you are okay with conda/pip mix) - pip: - - -e .."[doc, test]" \ No newline at end of file + - -e .."[doc, test]" + \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 8214b7e..8d78e38 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,10 @@ build-backend = "setuptools.build_meta" # enable dynamic versioning based on git tags [tool.setuptools_scm] +# Format version to ease alignment with conda/meta.yaml tag-based versioning +fallback_version = "1.4.0.dev0" +version_scheme = "guess-next-dev" +local_scheme = "no-local-version" [project] name = "rsml" @@ -18,20 +22,19 @@ authors = [ license = "CECILL-C" license-files = ["LICEN[CS]E*"] keywords = ["OpenAlea", "RSML", "Plant Architecture"] -requires-python = ">=3.9" +requires-python = ">=3.10" classifiers = [ "Intended Audience :: Science/Research", "Intended Audience :: Developers", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering", ] dependencies = [ - "matplotlib", "pandas", "xlsxwriter", "path", @@ -69,6 +72,7 @@ channels = [ ] dependencies = [ "openalea.mtg", + "matplotlib-base", ] [tool.setuptools.packages.find]