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 /reftools | |
parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz |
Fix conflict
Diffstat (limited to 'reftools')
-rw-r--r-- | reftools/reftools.ini | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/reftools/reftools.ini b/reftools/reftools.ini index 6245c19..0b3ef60 100644 --- a/reftools/reftools.ini +++ b/reftools/reftools.ini @@ -1,6 +1,6 @@ [package] name: reftools -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python @@ -12,21 +12,32 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}.git [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: yes [requirements] build: d2to1 stsci.distutils + stsci.ndimage + stsci.imagestats stsci.tools pywcs + pysynphot + stwcs + calcos numpy setuptools python run: d2to1 stsci.distutils + stsci.ndimage + stsci.imagestats stsci.tools pywcs + pysynphot + stwcs + calcos numpy python |