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) --- astroquery/bld.bat | 1 - astroquery/meta.yaml | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'astroquery') diff --git a/astroquery/bld.bat b/astroquery/bld.bat index 85a7bc3..39b5e1f 100644 --- a/astroquery/bld.bat +++ b/astroquery/bld.bat @@ -1,2 +1 @@ %PYTHON% setup.py install -if errorlevel 1 exit 1 diff --git a/astroquery/meta.yaml b/astroquery/meta.yaml index 9966388..02f3c5e 100644 --- a/astroquery/meta.yaml +++ b/astroquery/meta.yaml @@ -1,11 +1,9 @@ {% set name = 'astroquery' %} -{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0") - +".dev" - +environ.get("GIT_DESCRIBE_NUMBER", "0") %} +{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} {% if version[0] == 'v' %} -{% set version = version[1:] %} +{% set version = version[1:] %} {% endif %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/astropy/{{ name }} @@ -31,7 +29,7 @@ requirements: - html5lib - secretstorage [linux] - setuptools - - python + - python {{ python }} run: - astropy -- cgit