From 64fea22c2b62473ac935bf56a46306c4e550d170 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 26 Nov 2024 14:35:46 +0100 Subject: [PATCH] back to getting version for conda from tag (#1059) --- conda-recipe/build_pylib.sh | 3 --- conda-recipe/meta.yaml | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/conda-recipe/build_pylib.sh b/conda-recipe/build_pylib.sh index b2a2fb05f..18b0615ab 100755 --- a/conda-recipe/build_pylib.sh +++ b/conda-recipe/build_pylib.sh @@ -8,7 +8,4 @@ cd python # copy VERSION into slsdet for installation cp ../VERSION slsdet/VERSION -# to be used to get project version in meta.yaml -export SLS_DET_VERSION=$(cat python/slsdet/VERSION) - ${PYTHON} setup.py install diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ca770779d..076e37ebc 100755 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,6 @@ - -{% set version = environ.get('SLS_DET_VERSION', '0.0.0') %} - - package: name: sls_detector_software - version: "{{ version }}" + version: {{ environ.get('GIT_DESCRIBE_TAG', '') }} source: