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) --- python-daemon/bld.bat | 3 +-- python-daemon/build.sh | 2 +- python-daemon/meta.yaml | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'python-daemon') diff --git a/python-daemon/bld.bat b/python-daemon/bld.bat index b290566..760380e 100644 --- a/python-daemon/bld.bat +++ b/python-daemon/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/python-daemon/build.sh b/python-daemon/build.sh index 4b71885..6bd6081 100644 --- a/python-daemon/build.sh +++ b/python-daemon/build.sh @@ -1,2 +1,2 @@ -python setup.py install || exit 1 \ No newline at end of file +$PYTHON setup.py install diff --git a/python-daemon/meta.yaml b/python-daemon/meta.yaml index 5605faa..0af3c79 100644 --- a/python-daemon/meta.yaml +++ b/python-daemon/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'python-daemon' %} {% set version = '2.0.5' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://bitbucket.org/jhunkeler/python-daemon @@ -18,11 +18,11 @@ requirements: build: - docutils - lockfile - - python x.x + - python {{ python }} run: - lockfile - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz -- cgit