From 286c9d0cd069759d090007da647e78afdb937596 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 5 Jan 2018 15:01:53 -0500 Subject: [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) --- xpa/bld.bat | 2 +- xpa/build.sh | 2 +- xpa/meta.yaml | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'xpa') diff --git a/xpa/bld.bat b/xpa/bld.bat index 60d77ab..f63e097 100644 --- a/xpa/bld.bat +++ b/xpa/bld.bat @@ -1,3 +1,3 @@ echo Nope -exit 1 \ No newline at end of file +exit 1 diff --git a/xpa/build.sh b/xpa/build.sh index 60e0175..e9948fd 100644 --- a/xpa/build.sh +++ b/xpa/build.sh @@ -4,4 +4,4 @@ rm -rf python ./configure --prefix=$PREFIX \ --enable-shared make -j${CPU_COUNT} -make install || exit 1 \ No newline at end of file +make install diff --git a/xpa/meta.yaml b/xpa/meta.yaml index 479a70c..e4507b2 100644 --- a/xpa/meta.yaml +++ b/xpa/meta.yaml @@ -1,20 +1,25 @@ {% set name = 'xpa' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/ericmandel/{{ name }} license: MIT summary: Provides seamless communication between many kinds of Unix programs + build: number: {{ number }} + package: name: {{ name }} version: {{ version }} + source: git_url: https://github.com/ericmandel/{{ name }}.git + test: commands: - test -x `which xpaget` -- cgit