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 /pysynphot | |
| parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
| parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
| download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz | |
Fix conflict
Diffstat (limited to 'pysynphot')
| -rw-r--r-- | pysynphot/pysynphot.ini | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini index 792e827..904ac5f 100644 --- a/pysynphot/pysynphot.ini +++ b/pysynphot/pysynphot.ini @@ -1,6 +1,6 @@ [package] name: pysynphot -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: ssh://git@bitbucket.org/stsci_ssb/${package:name} @@ -9,9 +9,11 @@ summary: ${package:name} [source] git_url: ${about:home} -git_tag: +#git_tag: + [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: yes [requirements] build: @@ -37,13 +39,12 @@ run: pyfits numpy matplotlib - setuptools python [cbc_build] linux: echo This d2to1 hack is deadly. - #pip install --no-deps --upgrade --force d2to1 || exit 1 + pip install --no-deps --upgrade --force d2to1 || exit 1 python setup.py install || exit 1 windows: |