diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1527f2aa521cdfcbe9f15eff8dbd0f66b243f2ac..ca2081d712ba36959bb4c80851d18b3763e769fe 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 e7311098549089ec4fc087532ab2ee2bdb3d0ac5..5aca0914e4a6219e3d6c5cd5879ba1741bbb8386 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 9abfa75172bb9fa5352409816a7c741132ef4c21..5f5cc4d585a3cc8fbe9b70d2df7b39ac6b5f7f88 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 574a495a4c8a47f3beb75c759d10b811825b07c2..ea15ebccbb55cbd59ad5f3e7463c0c2c4f5814fb 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 1d7b1555664d6f012ee9e27c634b7f4209489052..cebc7cc93c1ffded66a7cec6c1b0aa0e27f3975f 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: ../