aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--astroconda-iraf-helpers/meta.yaml3
-rw-r--r--iraf-all/meta.yaml6
-rw-r--r--iraf-help/meta.yaml4
-rw-r--r--iraf-x11/meta.yaml4
-rw-r--r--iraf.fitsutil/meta.yaml4
-rw-r--r--iraf.gemini/meta.yaml4
-rw-r--r--iraf.stecf/meta.yaml2
-rw-r--r--iraf.stsdas/meta.yaml4
-rw-r--r--iraf.tables/meta.yaml4
-rw-r--r--iraf/bld.bat (renamed from iraf-core/bld.bat)0
-rw-r--r--iraf/build.sh (renamed from iraf-core/build.sh)0
-rw-r--r--iraf/meta.yaml (renamed from iraf-core/meta.yaml)4
12 files changed, 21 insertions, 18 deletions
diff --git a/astroconda-iraf-helpers/meta.yaml b/astroconda-iraf-helpers/meta.yaml
index b1f4c8e..aa143da 100644
--- a/astroconda-iraf-helpers/meta.yaml
+++ b/astroconda-iraf-helpers/meta.yaml
@@ -13,7 +13,8 @@ source:
git_url: https://github.com/astroconda/astroconda-iraf-helpers.git
requirements:
run:
- - iraf-core !=2.16.1,>=2.16.UR # conda considers 2.16.1 > 2.16.UR/UR_2.16
+ - iraf !=2.16.1,>=2.16.UR # conda considers 2.16.1 > 2.16.UR/UR_2.16
+
# PyRAF is needed by scripts/make_iraf_help, but we're trying to replace
# that with $iraf/make_help, so these are commented out to avoid pulling in
# masses of unnecessary Python build dependencies for every IRAF package:
diff --git a/iraf-all/meta.yaml b/iraf-all/meta.yaml
index c02a1db..b79c8a8 100644
--- a/iraf-all/meta.yaml
+++ b/iraf-all/meta.yaml
@@ -14,7 +14,8 @@ requirements:
# builds correctly -- the packages are listed in their build order here,
# in the hope of circumventing that problem).
build:
- - iraf !=2.16.1,>=2.16.UR # (meta package including X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR
+ - iraf-x11 >=2.0
- iraf.fitsutil
- iraf.tables
- iraf.stsdas
@@ -23,7 +24,8 @@ requirements:
# For public use, these need to be floating version numbers, to allow
# updating constituent packages easily:
run:
- - iraf !=2.16.1,>=2.16.UR # (meta package including X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR
+ - iraf-x11 >=2.0
- iraf.fitsutil
- iraf.tables
- iraf.stsdas
diff --git a/iraf-help/meta.yaml b/iraf-help/meta.yaml
index 2844006..b6fad01 100644
--- a/iraf-help/meta.yaml
+++ b/iraf-help/meta.yaml
@@ -11,6 +11,6 @@ package:
requirements:
build:
- astroconda-iraf-helpers # depends on PyRAF, hence why separate
- - iraf-core !=2.16.1,>=2.16.UR
+ - iraf !=2.16.1,>=2.16.UR
run:
- - iraf-core !=2.16.1,>=2.16.UR
+ - iraf !=2.16.1,>=2.16.UR
diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml
index 8fdd259..f6adbe4 100644
--- a/iraf-x11/meta.yaml
+++ b/iraf-x11/meta.yaml
@@ -14,10 +14,10 @@ package:
requirements:
build:
- iraf-os-libs # [linux]
- - iraf-core !=2.16.1,>=2.16.UR
+ - iraf !=2.16.1,>=2.16.UR
run:
- iraf-os-libs # [linux]
- - iraf-core !=2.16.1,>=2.16.UR
+ - iraf !=2.16.1,>=2.16.UR
source:
svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/x11iraf/trunk/
diff --git a/iraf.fitsutil/meta.yaml b/iraf.fitsutil/meta.yaml
index 0a41417..59b0eea 100644
--- a/iraf.fitsutil/meta.yaml
+++ b/iraf.fitsutil/meta.yaml
@@ -5,7 +5,7 @@ about:
build:
binary_relocation: False
number: '0'
- # These must be copied from astroconda-iraf-helpers, since conda unhelpfully
+ # These must be copied from astroconda-iraf-helpers, as conda unhelpfully
# disallows the post-install step from depending on other packages:
always_include_files:
- bin/ac_config_iraf_pkg
@@ -21,7 +21,7 @@ source:
requirements:
build:
- astroconda-iraf-helpers
- - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR
run:
- iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version)
diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml
index 347d798..f3e2df1 100644
--- a/iraf.gemini/meta.yaml
+++ b/iraf.gemini/meta.yaml
@@ -6,7 +6,7 @@ about:
build:
binary_relocation: False
number: '0'
- # These must be copied from astroconda-iraf-helpers, since conda unhelpfully
+ # These must be copied from astroconda-iraf-helpers, as conda unhelpfully
# disallows the post-install step from depending on other packages:
always_include_files:
- bin/ac_config_iraf_pkg
@@ -22,7 +22,7 @@ source:
requirements:
build:
- astroconda-iraf-helpers
- - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF)
- iraf.tables
- iraf.stsdas
- iraf.fitsutil
diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml
index 5a7f672..aecf9bf 100644
--- a/iraf.stecf/meta.yaml
+++ b/iraf.stecf/meta.yaml
@@ -19,7 +19,7 @@ source:
requirements:
build:
- astroconda-iraf-helpers
- - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR
- iraf.tables
- iraf.stsdas
run:
diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml
index ae78994..fd2127d 100644
--- a/iraf.stsdas/meta.yaml
+++ b/iraf.stsdas/meta.yaml
@@ -5,7 +5,7 @@ about:
build:
binary_relocation: False
number: '0'
- # These must be copied from astroconda-iraf-helpers, since conda unhelpfully
+ # These must be copied from astroconda-iraf-helpers, as conda unhelpfully
# disallows the post-install step from depending on other packages:
always_include_files:
- bin/ac_config_iraf_pkg
@@ -21,7 +21,7 @@ source:
requirements:
build:
- astroconda-iraf-helpers
- - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR
- iraf.tables
run:
- iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version)
diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml
index f522110..599f19e 100644
--- a/iraf.tables/meta.yaml
+++ b/iraf.tables/meta.yaml
@@ -5,7 +5,7 @@ about:
build:
binary_relocation: False
number: '0'
- # These must be copied from astroconda-iraf-helpers, since conda unhelpfully
+ # These must be copied from astroconda-iraf-helpers, as conda unhelpfully
# disallows the post-install step from depending on other packages:
always_include_files:
- bin/ac_config_iraf_pkg
@@ -21,7 +21,7 @@ source:
requirements:
build:
- astroconda-iraf-helpers
- - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF)
+ - iraf !=2.16.1,>=2.16.UR
run:
- iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version)
diff --git a/iraf-core/bld.bat b/iraf/bld.bat
index fa5316a..fa5316a 100644
--- a/iraf-core/bld.bat
+++ b/iraf/bld.bat
diff --git a/iraf-core/build.sh b/iraf/build.sh
index 0ce0b6e..0ce0b6e 100644
--- a/iraf-core/build.sh
+++ b/iraf/build.sh
diff --git a/iraf-core/meta.yaml b/iraf/meta.yaml
index 00a4bdd..83dd666 100644
--- a/iraf-core/meta.yaml
+++ b/iraf/meta.yaml
@@ -1,7 +1,7 @@
about:
home: http://iraf.noao.edu
license: MIT (and third-party licenses)
- summary: NOAO Image Reduction and Analysis Facility (excluding help)
+ summary: NOAO Image Reduction and Analysis Facility
build:
binary_relocation: False # [osx]
detect_binary_files_with_prefix: False
@@ -10,7 +10,7 @@ build:
- lib32/
number: '0'
package:
- name: iraf-core
+ name: iraf
version: "2.16.UR"
requirements:
build:
generated by cgit (git 2.34.1) at 2025-05-03 15:52:26 -0400