From f5291ceb365e811feb889c3c3bf219a312ad9e63 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 12:36:51 +0200 Subject: [PATCH 1/5] 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 311082c..7dd94b0 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 ae28f115a315ab0da0d9c8cbc04e7d7ebbb6f40f Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 12:39:10 +0200 Subject: [PATCH 2/5] matplotlib-base updated tool setuptools_scm in pyproject moved matplotlib-base to conda dependencies because does not exist in pip --- conda/environment.yml | 1 + pyproject.toml | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conda/environment.yml b/conda/environment.yml index 51bebb5..7922606 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -7,6 +7,7 @@ dependencies: - python - openalea.plantgl - openalea.lpy + - matplotlib-base - pip - pip: - -e .."[doc, test]" diff --git a/pyproject.toml b/pyproject.toml index a4c7434..1f80e73 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,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 = "2.2.0.dev0" +version_scheme = "guess-next-dev" +local_scheme = "no-local-version" [project] name = "openalea.mtg" @@ -26,12 +30,12 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering", ] keywords = ["OpenAlea", "MTG", "Plant Architecture", "Tree Graph"] dependencies = [ - "matplotlib-base", "pandas" ] @@ -68,7 +72,8 @@ channels = [ ] dependencies = [ "openalea.plantgl", - "openalea.lpy" + "openalea.lpy", + "matplotlib-base", ] From 893f519c884eaa7b7d259b508a82694690dddc5e Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 14:46:21 +0200 Subject: [PATCH 3/5] removed openalea.lpy only necessary when converting mtg 2 lpy and lpy 2 mtg --- conda/environment.yml | 1 - pyproject.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/conda/environment.yml b/conda/environment.yml index 7922606..aceaa5d 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -6,7 +6,6 @@ channels: dependencies: - python - openalea.plantgl - - openalea.lpy - matplotlib-base - pip - pip: diff --git a/pyproject.toml b/pyproject.toml index 1f80e73..2933b6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,6 @@ channels = [ ] dependencies = [ "openalea.plantgl", - "openalea.lpy", "matplotlib-base", ] From 32d3c762fe6bcf0c05eb2044bc46055cb5ccf348 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 14:59:00 +0200 Subject: [PATCH 4/5] disabled a test calling lpy --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 7dd94b0..77a83c5 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -50,7 +50,7 @@ test: - test/data/** commands: - cd test - - pytest -v --ignore=test_stat.py + - pytest -v --ignore=test_stat.py --ignore=test_parsing_axialtree.py about: home: {{ home }} From dc3ca93bf6f2c3626d5d66567b14f2fdb4be81f5 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 5 Sep 2025 15:11:11 +0200 Subject: [PATCH 5/5] add lpy in test dependencies --- conda/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 77a83c5..6b291b3 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -43,6 +43,7 @@ test: {% for dep in test_deps %} - {{ dep }} {% endfor %} + - openalea.lpy imports: - openalea.mtg source_files: @@ -50,7 +51,7 @@ test: - test/data/** commands: - cd test - - pytest -v --ignore=test_stat.py --ignore=test_parsing_axialtree.py + - pytest -v --ignore=test_stat.py about: home: {{ home }}