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 /astropy | |
| 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 'astropy')
| -rw-r--r-- | astropy/bld.bat | 3 | ||||
| -rw-r--r-- | astropy/build.sh | 2 | ||||
| -rw-r--r-- | astropy/meta.yaml | 23 |
3 files changed, 16 insertions, 12 deletions
diff --git a/astropy/bld.bat b/astropy/bld.bat index c50c85a..760380e 100644 --- a/astropy/bld.bat +++ b/astropy/bld.bat @@ -1,3 +1,2 @@ -python setup.py install --offline -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/astropy/build.sh b/astropy/build.sh index 762d43b..5a5aeeb 100644 --- a/astropy/build.sh +++ b/astropy/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/astropy/meta.yaml b/astropy/meta.yaml index 1844182..dc1c88b 100644 --- a/astropy/meta.yaml +++ b/astropy/meta.yaml @@ -1,6 +1,10 @@ {% set name = 'astropy' %} -{% set version = '3.0.dev' + environ.get("GIT_DESCRIBE_NUMBER", "0") %} -{% set number = '0' %} +{% set version = "3.0.0.dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set commit = '76c58d4b8d7baa6641a114c3927b2464805e1a09' %} +{% set number = '1' %} about: home: https://github.com/astropy/{{ name }} @@ -8,7 +12,7 @@ about: summary: Astropy is a package intended to contain much of the core functionality and some common tools needed for performing astronomy and astrophysics with Python. build: - skip: True [py27] + skip: True [py27 or py33 or py34] number: {{ number }} package: @@ -21,12 +25,11 @@ requirements: - jinja2 - pytest - setuptools - - numpy x.x - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - - beautiful-soup [py27 or py34] - - beautifulsoup4 [py>=35] + - beautifulsoup4 - cython - h5py - ipython @@ -39,10 +42,11 @@ requirements: - pyyaml - scikit-image - scipy - - numpy x.x - - python x.x + - numpy + - python source: + git_rev: {{ commit }} git_url: https://github.com/astropy/{{ name }}.git test: @@ -56,3 +60,4 @@ test: - wcslint --help imports: - astropy + |