From e5bf0cbe7eb556d4aa217bf25dc12229d5a4719e Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 11 Aug 2015 13:48:48 -0400 Subject: Fix empty GIT_DESCRIBE_TAG default (0.0.0) --- pysynphot/pysynphot.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pysynphot') diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini index 792e827..ad0b999 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} -- cgit From 4b00c5abebcd321fd95755c4816d2fd6790a172b Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 25 Sep 2015 15:26:53 -0400 Subject: Corrected for building under python 3.4 --- pysynphot/pysynphot.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pysynphot') diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini index ad0b999..904ac5f 100644 --- a/pysynphot/pysynphot.ini +++ b/pysynphot/pysynphot.ini @@ -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: -- cgit