From d968f8932827ce0d010f4a7ceb8b2d26ae3f1cb8 Mon Sep 17 00:00:00 2001 From: "Martin K. Scherer" Date: Tue, 7 Jun 2016 15:05:59 +0200 Subject: [PATCH] [conda-recipe] set version by git env variables exported by conda-build (#820) --- devtools/conda-recipe/bld.bat | 1 - devtools/conda-recipe/build.sh | 1 - devtools/conda-recipe/dev_version.py | 5 ----- devtools/conda-recipe/meta.yaml | 2 +- 4 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 devtools/conda-recipe/dev_version.py diff --git a/devtools/conda-recipe/bld.bat b/devtools/conda-recipe/bld.bat index 7cfd03316..38163a4c3 100644 --- a/devtools/conda-recipe/bld.bat +++ b/devtools/conda-recipe/bld.bat @@ -6,5 +6,4 @@ if not defined APPVEYOR ( cmd /E:ON /V:ON /C %APPVEYOR_BUILD_FOLDER%\devtools\ci\appveyor\run_with_env.cmd "%PYTHON%" setup.py install ) set build_status=%ERRORLEVEL% -"%PYTHON%" devtools\conda-recipe\dev_version.py if %build_status% == 1 exit 1 diff --git a/devtools/conda-recipe/build.sh b/devtools/conda-recipe/build.sh index 9c9d57833..4dad93a1c 100755 --- a/devtools/conda-recipe/build.sh +++ b/devtools/conda-recipe/build.sh @@ -1,3 +1,2 @@ #!/bin/bash $PYTHON setup.py install -$PYTHON devtools/conda-recipe/dev_version.py diff --git a/devtools/conda-recipe/dev_version.py b/devtools/conda-recipe/dev_version.py deleted file mode 100644 index e3c1704a6..000000000 --- a/devtools/conda-recipe/dev_version.py +++ /dev/null @@ -1,5 +0,0 @@ -from __future__ import print_function -from pyemma import __version__ as version - -with open('__conda_version__.txt', 'w') as f: - f.write(version) diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index a49bb5332..7b59260c3 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: pyemma-dev - #version: 0 + version: {{ environ.get('GIT_DESCRIBE_TAG','')+environ.get('GIT_BUILD_STR', 'unknown')[1:] }} source: path: ../..