From d796aa61fc1b4db824af84ad7a9a61b9256cfafc Mon Sep 17 00:00:00 2001
From: Guillaume Cerutti <guillaume.cerutti@inria.fr>
Date: Thu, 28 Mar 2024 10:55:31 +0100
Subject: [PATCH] update recipe + CI
---
.gitlab-ci.yml | 17 ++++++++---------
CHANGES.md | 2 +-
README.md | 2 +-
conda/env.yaml | 3 ++-
conda/meta.yaml | 3 +--
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1527f2a..ca2081d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,8 @@ releaseTest:
script:
- . "/builds/miniconda3/etc/profile.d/conda.sh"
- conda activate base
- - mamba env update -f conda/env.yaml
+ - conda env remove -n gnomon_package_tissueimagemesh
+ - mamba env create -f conda/env.yaml
- conda activate gnomon_package_tissueimagemesh
- python -m pip install .
- nose2 -v
@@ -37,7 +38,8 @@ test_MR_linux:
script:
- . "/builds/miniconda3/etc/profile.d/conda.sh"
- conda activate base
- - mamba env update -f conda/env.yaml
+ - conda env remove -n gnomon_package_tissueimagemesh
+ - mamba env create -f conda/env.yaml
- conda activate gnomon_package_tissueimagemesh
- python -m pip install .
- nose2 -v
@@ -72,7 +74,8 @@ test_MR_macos:
script:
- source /Users/ci/miniconda3/etc/profile.d/conda.sh
- conda activate base
- - mamba env update -f conda/env.yaml
+ - conda env remove -n gnomon_package_tissueimagemesh
+ - mamba env create -f conda/env.yaml
- conda activate gnomon_package_tissueimagemesh
- pip install .
- nose2 -v
@@ -124,9 +127,7 @@ anaconda:
script:
- . "/builds/miniconda3/etc/profile.d/conda.sh"
- conda activate base
- - anaconda --token=$ANACONDA_TOKEN --verbose upload conda-bld/linux-64/gnomon_package_tissueimagemesh-* --user gnomon --force
- - conda convert -p osx-64 conda-bld/linux-64/gnomon_package_tissueimagemesh-* --output-dir conda-bld/
- - anaconda --token=$ANACONDA_TOKEN --verbose upload conda-bld/osx-64/gnomon_package_tissueimagemesh-* --user gnomon --force
+ - anaconda --token=$ANACONDA_TOKEN --verbose upload conda-bld/noarch/gnomon_package_tissueimagemesh-* --user gnomon --force
only:
- master
@@ -138,9 +139,7 @@ anaconda_develop:
script:
- . "/builds/miniconda3/etc/profile.d/conda.sh"
- conda activate base
- - anaconda --token=$ANACONDA_TOKEN --verbose upload conda-bld/linux-64/gnomon_package_tissueimagemesh-* --user gnomon --force
- - conda convert -p osx-64 conda-bld/linux-64/gnomon_package_tissueimagemesh-* --output-dir conda-bld/
- - anaconda --token=$ANACONDA_TOKEN --verbose upload conda-bld/osx-64/gnomon_package_tissueimagemesh-* --user gnomon --force
+ - anaconda --token=$ANACONDA_TOKEN --verbose upload conda-bld/noarch/gnomon_package_tissueimagemesh-* --user gnomon --force
when: manual
only:
- develop
diff --git a/CHANGES.md b/CHANGES.md
index e731109..5aca091 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,6 @@
## version 0.3.0 - 2023-07-10
-* gnomon 1.0.0
+* gnomon 0.81.0
* new cell layer/curvature plugin
* enhance image surface plugin
diff --git a/README.md b/README.md
index 9abfa75..5f5cc4d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# Gnomon plugin package : `Tissue Image Mesk`
+# Gnomon plugin package : `Tissue Image Mesh`
This package contains Python plugins for the [Gnomon computational platform](https://gnomon.gitlabpages.inria.fr/gnomon/) to convert 3D images into topological representations.
\ No newline at end of file
diff --git a/conda/env.yaml b/conda/env.yaml
index 574a495..ea15ebc 100644
--- a/conda/env.yaml
+++ b/conda/env.yaml
@@ -4,12 +4,13 @@ channels:
- mosaic
- morpheme
- gnomon
- - dtk-forge-staging
+ - dtk-forge6
- conda-forge
dependencies:
- python=3.9
- gnomon=1.0
- gnomon_package_tissueimage
+ - gnomon_package_tissuemesh
- ipython
- nose2
- coverage
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 1d7b155..cebc7cc 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -1,7 +1,6 @@
package:
name: gnomon_package_tissueimagemesh
- # version: {{ environ.get('GIT_DESCRIBE_TAG', 'default') }}
- version: 1.0.0
+ version: {{ environ.get('GIT_DESCRIBE_TAG', 'default') }}
source:
path: ../
--
GitLab