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 /pydrizzle | |
| parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
| parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
| download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz | |
Fix conflict
Diffstat (limited to 'pydrizzle')
| -rw-r--r-- | pydrizzle/pydrizzle.ini | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini index fe5b556..46cd116 100644 --- a/pydrizzle/pydrizzle.ini +++ b/pydrizzle/pydrizzle.ini @@ -1,6 +1,6 @@ [package] name: pydrizzle -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 @@ -21,6 +21,8 @@ build: astropy >=1.0 numpy >=1.6.0 stsci.distutils + stsci.tools + pyfits setuptools python @@ -29,12 +31,39 @@ run: astropy-helpers astropy >=1.0 numpy >=1.6.0 + stsci.tools + pyfits python [cbc_build] linux: + function get_py_version() { + python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' + } + export -f get_py_version + + function set_py3k() { + version=`get_py_version` + major=`echo $$version | cut -d '.' -f 1` + minor=`echo $$version | cut -d '.' -f 2` + hotfix=`echo $$version | cut -d '.' -f 3` + if (( major > 2 )); then + export PY3K=1 + else + export PY3K=0 + fi + } + export -f set_py3k + + set_py3k + + if [ $$PY3K -ne 0 ]; then + sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg + fi + echo This d2to1 hack is deadly. pip install --no-deps --upgrade --force d2to1 || exit 1 + python setup.py install || exit 1 windows: |