diff options
| author | James E.H. Turner <jturner@gemini.edu> | 2016-10-27 14:54:06 -0400 |
|---|---|---|
| committer | James E.H. Turner <jturner@gemini.edu> | 2016-10-27 14:54:06 -0400 |
| commit | 70b470a872dd001428b45530e67bd2ac0b195767 (patch) | |
| tree | e3cd8172ea7e5a58ae72aa8c1763c1f35f59c4b2 | |
| parent | 634257fb47691d91a9940ef4d37e4a4756900248 (diff) | |
| download | astroconda-iraf-70b470a872dd001428b45530e67bd2ac0b195767.tar.gz | |
Make external IRAF packages depend on "iraf" (not just "iraf-core"), to ensure the old (conflicting) "iraf" can't be installed simultaneously.
| -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 |
5 files changed, 10 insertions, 15 deletions
diff --git a/iraf.fitsutil/meta.yaml b/iraf.fitsutil/meta.yaml index 8a38dae..0a41417 100644 --- a/iraf.fitsutil/meta.yaml +++ b/iraf.fitsutil/meta.yaml @@ -21,8 +21,7 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core !=2.16.1,>=2.16.UR + - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) run: - - iraf-core !=2.16.1,>=2.16.UR - - iraf-help !=2.16.1,>=2.16.UR + - 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 92cd9e0..347d798 100644 --- a/iraf.gemini/meta.yaml +++ b/iraf.gemini/meta.yaml @@ -22,13 +22,12 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core !=2.16.1,>=2.16.UR + - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) - iraf.tables - iraf.stsdas - iraf.fitsutil run: - - iraf-core !=2.16.1,>=2.16.UR - - iraf-help !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) - iraf.tables - iraf.stsdas - iraf.fitsutil diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml index 7dbfcd1..5a7f672 100644 --- a/iraf.stecf/meta.yaml +++ b/iraf.stecf/meta.yaml @@ -19,12 +19,11 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core !=2.16.1,>=2.16.UR + - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) - iraf.tables - iraf.stsdas run: - - iraf-core !=2.16.1,>=2.16.UR - - iraf-help !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) - iraf.tables - iraf.stsdas diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml index e7ba0c6..ae78994 100644 --- a/iraf.stsdas/meta.yaml +++ b/iraf.stsdas/meta.yaml @@ -21,10 +21,9 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core !=2.16.1,>=2.16.UR + - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) - iraf.tables run: - - iraf-core !=2.16.1,>=2.16.UR - - iraf-help !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) - iraf.tables diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 6b89fc4..f522110 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -21,8 +21,7 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core !=2.16.1,>=2.16.UR + - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) run: - - iraf-core !=2.16.1,>=2.16.UR - - iraf-help !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) |