diff options
| author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
|---|---|---|
| committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
| commit | 97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53 (patch) | |
| tree | b85aa67a9968cf37c1ea5a0e38545f77ebd01b00 /webbpsf | |
| parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
| parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
| download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz | |
Fix conflict
Diffstat (limited to 'webbpsf')
| -rw-r--r-- | webbpsf/webbpsf.ini | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini index 64969ac..2d3a839 100644 --- a/webbpsf/webbpsf.ini +++ b/webbpsf/webbpsf.ini @@ -1,6 +1,6 @@ [package] name: webbpsf -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/mperrin/${package:name} @@ -8,13 +8,11 @@ license: BSD summary: ${package:name} [source] -#fn: ${package:name}-${package:version}.tar.gz -#url: ${cbc_cgi:url}/${fn} git_url: ${about:home} -#git_tag: [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: True [requirements] build: @@ -37,6 +35,7 @@ run: matplotlib poppy six [py27] + webbpsf-data setuptools python |