From faabf61ca672c65b41c550114ba4cf7a69950aa9 Mon Sep 17 00:00:00 2001
From: Jonathan Legrand <jonathan.legrand@ens-lyon.fr>
Date: Tue, 5 Apr 2022 17:24:07 +0200
Subject: [PATCH] Update readme & fix CI jobs
---
.gitlab-ci.yml | 6 +++---
README.md | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c5692a..37cfa12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ pages:
paths:
- public
only:
- - main
+ - master
- develop
conda_build:
@@ -33,7 +33,7 @@ conda_build:
paths:
- conda-bld
only:
- - main
+ - master
conda_upload:
stage: deploy
@@ -43,4 +43,4 @@ conda_upload:
- anaconda --token=$ANACONDA_TOKEN upload conda-bld/osx-64/lpy_tools-* --user mosaic --label main
- anaconda --token=$ANACONDA_TOKEN upload conda-bld/win-64/lpy_tools-* --user mosaic --label main
only:
- - main
+ - master
diff --git a/README.md b/README.md
index b7af31e..9f572d0 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,17 @@ Most of the tools are meant to be used with the L-Py python API in a python file
### Install conda package
-You can install the conda package with:
+You can install the `openalea.lpy` & `lpy_tools` conda packages in an environment named `lpy` with python 3.9 as follows:
```shell
+conda create -n lpy python=3.9
+conda activate lpy
+conda install openalea.lpy -c fredboudon -c conda-forge
conda install lpy_tools -c mosaic -c fredboudon -c conda-forge
```
+:warning: You many need to install OpenGL system dependency. On Ubuntu `sudo apt install freeglut3-dev`.
+
### Install from sources
To **create a new conda environment** (will be named `lpy_tools`) and install the required dependencies:
--
GitLab