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) --- ginga/bld.bat | 4 +--- ginga/build.sh | 5 +++-- ginga/meta.yaml | 29 +++++++++++++++++++---------- 3 files changed, 23 insertions(+), 15 deletions(-) (limited to 'ginga') diff --git a/ginga/bld.bat b/ginga/bld.bat index b290566..39b5e1f 100644 --- a/ginga/bld.bat +++ b/ginga/bld.bat @@ -1,3 +1 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file +%PYTHON% setup.py install diff --git a/ginga/build.sh b/ginga/build.sh index d0bc088..8c640a4 100644 --- a/ginga/build.sh +++ b/ginga/build.sh @@ -1,3 +1,4 @@ - +# README has invalid unicode characters echo > README.txt -python setup.py install || exit 1 \ No newline at end of file + +$PYTHON setup.py install diff --git a/ginga/meta.yaml b/ginga/meta.yaml index 470f6bc..be744ad 100644 --- a/ginga/meta.yaml +++ b/ginga/meta.yaml @@ -1,11 +1,14 @@ {% set name = 'ginga' %} -{% set version = '2.5.20151215011852' %} -{% 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 = '0' %} about: - home: https://github.com/ejeschke/ginga + home: https://github.com/ejeschke/{{ name }} license: BSD - summary: ginga + summary: Astronomical data visualization build: number: {{ number }} @@ -16,18 +19,24 @@ package: requirements: build: - - numpy + - astropy + - qtpy + - pillow - setuptools - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: + - astropy + - qtpy + - pillow - numpy - - python x.x + - python source: - fn: {{ name }}-{{ version }}.tar.gz - md5: 11cd8b9ed459c4438cc827e0a1ca4538 - url: https://pypi.python.org/packages/source/g/ginga/{{ name }}-{{ version }}.tar.gz + git_url: https://github.com/ejeschke/{{ name }}.git test: + commands: + - ginga --help imports: - ginga -- cgit