summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunk@stsci.edu>2016-04-29 10:13:47 -0400
committerJoseph Hunkeler <jhunk@stsci.edu>2016-04-29 10:13:47 -0400
commit8834d907ad3db505b83940d854e4b8452644e5c6 (patch)
tree31efd3ad50d9b45f363869e72503a472208c0dd2
parent84432a89cb58f32fc05f2e3d684d2a3cf85c7414 (diff)
parent45eba016ac9a71ce2fce1ddbe2cb7e24c8733735 (diff)
downloadastroconda-contrib-8834d907ad3db505b83940d854e4b8452644e5c6.tar.gz
Merge branch 'release_1.0.0'
-rw-r--r--crds/meta.yaml5
-rw-r--r--stsci-hst/meta.yaml6
2 files changed, 6 insertions, 5 deletions
diff --git a/crds/meta.yaml b/crds/meta.yaml
index 12e7ae4..50b4c62 100644
--- a/crds/meta.yaml
+++ b/crds/meta.yaml
@@ -3,11 +3,11 @@ about:
license: AURA
summary: crds
build:
- number: '{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}'
+ number: '0'
preserve_egg_dir: 'no'
package:
name: crds
- version: '{{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}'
+ version: 6.0.0
requirements:
build:
- d2to1
@@ -20,6 +20,7 @@ requirements:
- numpy x.x
- python x.x
source:
+ git_tag: 6.0.0
git_url: https://github.com/spacetelescope/crds
test:
imports:
diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml
index b8fbf95..2e92a7f 100644
--- a/stsci-hst/meta.yaml
+++ b/stsci-hst/meta.yaml
@@ -3,7 +3,7 @@ about:
license: BSD
summary: stsci-hst meta-package
build:
- number: '0'
+ number: '1'
package:
name: stsci-hst
version: 1.0.0
@@ -15,7 +15,7 @@ requirements:
- astropy >=1.1
- calcos ==3.1.3
- costools ==1.2.1
- - crds ==0.0.0
+ - crds ==6.0.0
- d2to1 ==0.2.12
- drizzlepac ==2.1.3
- fitsblender ==0.2.6
@@ -50,7 +50,7 @@ requirements:
- astropy >=1.1
- calcos ==3.1.3
- costools ==1.2.1
- - crds ==0.0.0
+ - crds ==6.0.0
- d2to1 ==0.2.12
- drizzlepac ==2.1.3
- fitsblender ==0.2.6