diff options
| -rw-r--r-- | astroconda-iraf-helpers/meta.yaml | 2 | ||||
| -rw-r--r-- | iraf-core/bld.bat (renamed from iraf/bld.bat) | 0 | ||||
| -rw-r--r-- | iraf-core/build.sh (renamed from iraf/build.sh) | 0 | ||||
| -rw-r--r-- | iraf-core/meta.yaml (renamed from iraf/meta.yaml) | 2 | ||||
| -rw-r--r-- | iraf-help/meta.yaml | 4 | ||||
| -rw-r--r-- | iraf-x11/meta.yaml | 4 | ||||
| -rw-r--r-- | iraf.fitsutil/meta.yaml | 5 | ||||
| -rw-r--r-- | iraf.gemini/meta.yaml | 5 | ||||
| -rw-r--r-- | iraf.stecf/meta.yaml | 5 | ||||
| -rw-r--r-- | iraf.stsdas/meta.yaml | 5 | ||||
| -rw-r--r-- | iraf.tables/meta.yaml | 5 |
11 files changed, 21 insertions, 16 deletions
diff --git a/astroconda-iraf-helpers/meta.yaml b/astroconda-iraf-helpers/meta.yaml index 6cbb845..fb00637 100644 --- a/astroconda-iraf-helpers/meta.yaml +++ b/astroconda-iraf-helpers/meta.yaml @@ -13,6 +13,6 @@ source: git_url: https://github.com/astroconda/astroconda-iraf-helpers.git requirements: run: - - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 + - iraf-core !=2.16.1,>=2.16.UR # conda considers 2.16.1 > 2.16.UR/UR_2.16 - pyraf diff --git a/iraf/bld.bat b/iraf-core/bld.bat index fa5316a..fa5316a 100644 --- a/iraf/bld.bat +++ b/iraf-core/bld.bat diff --git a/iraf/build.sh b/iraf-core/build.sh index 0ce0b6e..0ce0b6e 100644 --- a/iraf/build.sh +++ b/iraf-core/build.sh diff --git a/iraf/meta.yaml b/iraf-core/meta.yaml index f3628f3..f74b1b4 100644 --- a/iraf/meta.yaml +++ b/iraf-core/meta.yaml @@ -10,7 +10,7 @@ build: - lib32/ number: '0' package: - name: iraf + name: iraf-core version: 2.16.UR requirements: build: diff --git a/iraf-help/meta.yaml b/iraf-help/meta.yaml index b6fad01..2844006 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 !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml index f6adbe4..8fdd259 100644 --- a/iraf-x11/meta.yaml +++ b/iraf-x11/meta.yaml @@ -14,10 +14,10 @@ package: requirements: build: - iraf-os-libs # [linux] - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - iraf-os-libs # [linux] - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=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 b1d2114..8a38dae 100644 --- a/iraf.fitsutil/meta.yaml +++ b/iraf.fitsutil/meta.yaml @@ -21,7 +21,8 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml index 9ae937d..92cd9e0 100644 --- a/iraf.gemini/meta.yaml +++ b/iraf.gemini/meta.yaml @@ -22,12 +22,13 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas - iraf.fitsutil run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas - iraf.fitsutil diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml index 6c0447f..7dbfcd1 100644 --- a/iraf.stecf/meta.yaml +++ b/iraf.stecf/meta.yaml @@ -19,11 +19,12 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml index fd8d9f0..e7ba0c6 100644 --- a/iraf.stsdas/meta.yaml +++ b/iraf.stsdas/meta.yaml @@ -21,9 +21,10 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR - iraf.tables run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR - iraf.tables diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 5a5a36b..6b89fc4 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -21,7 +21,8 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR |