diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2018-01-05 15:01:53 -0500 |
|---|---|---|
| committer | Matt Rendina <rendinam@users.noreply.github.com> | 2018-01-05 15:01:53 -0500 |
| commit | 286c9d0cd069759d090007da647e78afdb937596 (patch) | |
| tree | d418f7d652cc5de4fe638143c30549a4fe9267b6 /stsci.skypac | |
| parent | 90e6679788b9b9f81ef2ec1bad0d7b255ab5300d (diff) | |
| download | astroconda-dev-286c9d0cd069759d090007da647e78afdb937596.tar.gz | |
[WIP] Next (#75)
* Purge x.x style selectors
* Add python jinja2 selectors
* Add numpy jinja2 selectors
* Add basic build matrix configuration
* Delete iraf package; see astroconda/astroconda-iraf
* Bump all build revisions
* Remove drizzlepac and nose dependencies
* Fixup dependencies
* Strip newlines in version declaration
* Implements new package versioning scheme
* Revert sandboxing
* Purge old or unnecessary packages
* Clean up meta-packages
* Use fake version
* Minor clean up
* Add missing md5 hashes
* Python is not a dependency of XPA
* Remove GIT_ usage in non-git recipe
* Initial commit of asteval
* cubeviz: sed patching glue/numpy/pytest
* Add missing curly braces
* Remove references to pywcs
* Add mosviz
* Fix up specutils
* Forcefully strip all "v" version prefixes. Please stop using them.
* Fix ginga
* Use PYTHON
* Remove d2to1 dep
* Remove d2to1 dep
* Remove d2to1 dep
* Remove d2to1 dep
* Remove deprecated JWST pipeline packages
* Simplify python builds
* Simplify python builds (windows)
* Remove d2to1 dep
* Remove d2to1 dep
* Stop using 2to3
* Remove ATLAS
* Move sextractor to mainline
* Sextractor Intel MKL integration patches (i.e NO ATLAS)
Diffstat (limited to 'stsci.skypac')
| -rw-r--r-- | stsci.skypac/bld.bat | 3 | ||||
| -rw-r--r-- | stsci.skypac/build.sh | 27 | ||||
| -rw-r--r-- | stsci.skypac/meta.yaml | 17 |
3 files changed, 11 insertions, 36 deletions
diff --git a/stsci.skypac/bld.bat b/stsci.skypac/bld.bat index abdd1e3..5db04b7 100644 --- a/stsci.skypac/bld.bat +++ b/stsci.skypac/bld.bat @@ -1,4 +1,3 @@ -python setup.py install +%PYTHON% setup.py install 2to3 -w . -if errorlevel 1 exit 1
\ No newline at end of file diff --git a/stsci.skypac/build.sh b/stsci.skypac/build.sh index c2dff0e..5a5aeeb 100644 --- a/stsci.skypac/build.sh +++ b/stsci.skypac/build.sh @@ -1,26 +1 @@ - -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 -2to3 -w . -fi -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index 7c9800e..0a55332 100644 --- a/stsci.skypac/meta.yaml +++ b/stsci.skypac/meta.yaml @@ -1,8 +1,9 @@ {% set name = 'stsci.skypac' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '1' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -27,8 +28,8 @@ requirements: - stsci.tools - stwcs - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy @@ -36,8 +37,8 @@ requirements: - stsci.sphere - stsci.tools - stwcs - - python x.x - - python x.x + - python + - python source: git_url: https://github.com/spacetelescope/{{ name }} |