diff --git a/conda/environment.yml b/conda/environment.yml index 51bebb5..aceaa5d 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: - python - openalea.plantgl - - openalea.lpy + - matplotlib-base - pip - pip: - -e .."[doc, test]" diff --git a/conda/meta.yaml b/conda/meta.yaml index 311082c..6b291b3 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 %} @@ -46,6 +43,7 @@ test: {% for dep in test_deps %} - {{ dep }} {% endfor %} + - openalea.lpy imports: - openalea.mtg source_files: diff --git a/pyproject.toml b/pyproject.toml index a4c7434..2933b6b 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,7 @@ channels = [ ] dependencies = [ "openalea.plantgl", - "openalea.lpy" + "matplotlib-base", ]