diff --git a/.travis.yml b/.travis.yml index d6cd07a07..4b2a82db4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,4 +34,5 @@ deploy: script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; on: branch: developer + tags: true diff --git a/conda-recepie/meta.yaml b/conda-recepie/meta.yaml index 5817e805f..9bec2c228 100755 --- a/conda-recepie/meta.yaml +++ b/conda-recepie/meta.yaml @@ -1,7 +1,7 @@ package: name: sls_detector_software - version: "developer" + version: {{ environ.get('GIT_DESCRIBE_TAG', '') }} source: - path: .. diff --git a/python/setup.py b/python/setup.py index bdf459762..229e265b6 100755 --- a/python/setup.py +++ b/python/setup.py @@ -8,7 +8,7 @@ import sys import setuptools import os -__version__ = 'udp' +__version__ = os.environ.get('GIT_DESCRIBE_TAG', 'developer') def get_conda_path():