Skip to content

Commit

Permalink
Update readme + setup
Browse files Browse the repository at this point in the history
  • Loading branch information
AurelienBesnier committed Jan 26, 2024
1 parent f862653 commit 94c0cc9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,25 @@ Conda environement : https://docs.conda.io/en/latest/index.html

##### Create a new environment with phenomenal installed in there :

conda create -n phm -c conda-forge -c openalea openalea.phenomenal
conda activate phm
mamba create -n phm -c conda-forge -c openalea openalea.phenomenal
mamba activate phm

##### In a existing environment :

conda install -c conda-forge -c openalea openalea.phenomenal
mamba install -c conda-forge -c openalea openalea.phenomenal

##### (Optional) Test your installation :

conda install -c conda-forge pytest
mamba install -c conda-forge pytest
git clone https://github.com/openalea/phenomenal.git
cd phenomenal/test; pytest

#### From source

# Install dependency with conda
conda create -n phm -c conda-forge python
conda activate phm
conda install -c conda-forge -c numba cython numpy numba scipy scikit-image scikit-learn networkx opencv matplotlib vtk pytest skan=0.10
mamba create -n phm -c conda-forge python
mamba activate phm
mamba install -c conda-forge -c numba cython numpy numba scipy scikit-image scikit-learn networkx opencv matplotlib vtk pytest skan=0.10

# Load phenomenal and install
git clone https://github.com/openalea/phenomenal.git
Expand Down
7 changes: 5 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% set data = load_setup_py_data() %}

package:
name: openalea.phenomenal
version: "1.9.2"
version: {{ data.get('version') }}

source:
path: ..
Expand Down Expand Up @@ -70,9 +72,10 @@ test:
- pytest

about:
home: https://github.com/openalea/phenomenal
home: {{ data.get('url') }}
license: Cecill-C License
license_file: LICENSE.txt
summary: {{ data.get('description') }}

extra:
recipe-maintainers:
Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@

namespace = "openalea"
pkg_root_dir = 'src'
packages = find_namespace_packages(where='src', include=['openalea', 'openalea.*'])
top_pkgs = [pkg for pkg in packages if len(pkg.split('.')) <= 2]
package_dir = dict([('', pkg_root_dir)] +
[(pkg, pkg_root_dir + "/" + pkg.replace('.', '/'))
for pkg in top_pkgs])
packages = find_namespace_packages(where='src', include=['openalea.*'])


extentions = [
Expand Down Expand Up @@ -70,7 +66,7 @@

# package installation
packages=packages,
package_dir=package_dir,
package_dir={'': 'src'},
zip_safe=False,
ext_modules=cythonize(extentions),

Expand Down

0 comments on commit 94c0cc9

Please sign in to comment.