Skip to content

Commit

Permalink
[conda-recipe] set version by git env variables exported by conda-bui…
Browse files Browse the repository at this point in the history
  • Loading branch information
marscher committed Jun 7, 2016
1 parent 69298ed commit d968f89
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion devtools/conda-recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion devtools/conda-recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#!/bin/bash
$PYTHON setup.py install
$PYTHON devtools/conda-recipe/dev_version.py
5 changes: 0 additions & 5 deletions devtools/conda-recipe/dev_version.py

This file was deleted.

2 changes: 1 addition & 1 deletion devtools/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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: ../..

Expand Down

0 comments on commit d968f89

Please sign in to comment.