aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E.H. Turner <jturner@gemini.edu>2016-09-29 11:24:49 -0400
committerJames E.H. Turner <jturner@gemini.edu>2016-09-29 11:24:49 -0400
commit4ee8301df6891df89ede6aa3012f9a984ab5623c (patch)
tree73d350f0b5bd12ea2ee79781aedddd4a3a0548df
parent125a2feb45eaa3202cbda597259b7cdedb287876 (diff)
downloadastroconda-iraf-4ee8301df6891df89ede6aa3012f9a984ab5623c.tar.gz
Change IRAF version spec to make conda use our updated IRAF build without being tied to a single version number and to allow for adding a running number more naturally.
-rw-r--r--astroconda-utils/meta.yaml2
-rw-r--r--iraf.tables/meta.yaml4
-rw-r--r--iraf/meta.yaml2
3 files changed, 4 insertions, 4 deletions
diff --git a/astroconda-utils/meta.yaml b/astroconda-utils/meta.yaml
index e45a6c2..9a84ac3 100644
--- a/astroconda-utils/meta.yaml
+++ b/astroconda-utils/meta.yaml
@@ -13,6 +13,6 @@ source:
git_url: https://github.com/jehturner/astroconda-utils.git
requirements:
run:
- - iraf ==2.16_UR
+ - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16
- pyraf
diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml
index 6273e32..1e7836f 100644
--- a/iraf.tables/meta.yaml
+++ b/iraf.tables/meta.yaml
@@ -20,8 +20,8 @@ source:
- ac.iraf.stsci.patch
requirements:
build:
- - iraf ==2.16_UR
+ - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16
- astroconda-utils
run:
- - iraf ==2.16_UR
+ - iraf !=2.16.1,>=2.16.UR
diff --git a/iraf/meta.yaml b/iraf/meta.yaml
index 1719e86..2bd7031 100644
--- a/iraf/meta.yaml
+++ b/iraf/meta.yaml
@@ -8,7 +8,7 @@ build:
number: '0'
package:
name: iraf
- version: 2.16_UR
+ version: 2.16.UR
source:
# svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/branches/jhunk-patches
# svn_rev: 4156