Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conda/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dependencies:
- python
- openalea.plantgl
- openalea.lpy
- matplotlib-base
- pip
- pip:
- -e .."[doc, test]"
3 changes: 0 additions & 3 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ requirements:
- {{ dep }}
{% endfor %}

build:
- {{ compiler("cxx") }}

run:
- python
{% for dep in deps + conda_deps %}
Expand Down
9 changes: 7 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
]

Expand Down Expand Up @@ -68,7 +72,8 @@ channels = [
]
dependencies = [
"openalea.plantgl",
"openalea.lpy"
"openalea.lpy",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lpy is not mandatory.
Remove it. We want lpy only when we wante to convert mtg 2 lpy and lpy 2 mtg.
Otherelse, just pure Python!!!

"matplotlib-base",
]


Expand Down
Loading