aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Turner <jturner@gemini.edu>2018-01-07 04:19:37 -0500
committerJames Turner <jturner@gemini.edu>2018-01-07 04:19:37 -0500
commitb4aca80eb2022bde75cbde4fce99acf236b71749 (patch)
tree06b11438e6f0f4a46e4cb138d9c4ff19f8eb66de
parent539137d66b6574eb75df94617ff0403f4a07496e (diff)
parent04a1869679b6e359c8c13c803dd74aa7f98b1fa8 (diff)
downloadastroconda-iraf-b4aca80eb2022bde75cbde4fce99acf236b71749.tar.gz
Merge branch 'master' of github.com:astroconda/astroconda-iraf
-rw-r--r--iraf.stsdas/meta.yaml4
-rw-r--r--iraf.tables/meta.yaml4
-rw-r--r--pyraf-all/meta.yaml6
3 files changed, 8 insertions, 6 deletions
diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml
index e5479e6..87301e0 100644
--- a/iraf.stsdas/meta.yaml
+++ b/iraf.stsdas/meta.yaml
@@ -12,11 +12,11 @@ build:
- bin/ac_update_extern_pkg
package:
name: iraf.stsdas
- version: "3.18"
+ version: "3.18.1"
source:
# You must upload your ssh key to github to check out this private repo:
git_url: git@github.com:spacetelescope/stsdas.git
- git_tag: 3.18
+ git_tag: 3.18.1
patches:
- ac.iraf.stsci.patch
requirements:
diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml
index 8ab0116..6242acb 100644
--- a/iraf.tables/meta.yaml
+++ b/iraf.tables/meta.yaml
@@ -12,11 +12,11 @@ build:
- bin/ac_update_extern_pkg
package:
name: iraf.tables
- version: "3.18"
+ version: "3.18.1"
source:
# You must upload your ssh key to github to check out this private repo:
git_url: git@github.com:spacetelescope/stsdas.git
- git_tag: 3.18
+ git_tag: 3.18.1
patches:
- ac.iraf.stsci.patch
requirements:
diff --git a/pyraf-all/meta.yaml b/pyraf-all/meta.yaml
index 80eb11f..14ce986 100644
--- a/pyraf-all/meta.yaml
+++ b/pyraf-all/meta.yaml
@@ -15,10 +15,12 @@ package:
requirements:
build:
- iraf !=2.16.1,>=2.16.UR # external pkgs here need the ".UR" build
+ - python # needed just to get py2/3-specific builds
- pyraf
- - pyraf.kepler
+ - pyraf.kepler # [py2k]
run:
- iraf !=2.16.1,>=2.16.UR # should this be iraf-all, to get everything?
+ - python
- pyraf
- - pyraf.kepler
+ - pyraf.kepler # [py2k] # the authors only support Py 2, as of May 2017