From d53f69876e2c1cccdd2a5b12da9096dd3bd8aa1c Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 29 Nov 2016 14:42:29 -0500 Subject: Remove numpy locks --- gwcs/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gwcs') diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index a0b198d..168098f 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -12,12 +12,12 @@ requirements: - asdf - astropy >=1.1 - setuptools - - numpy x.x + - numpy - python x.x run: - asdf - astropy >=1.1 - - numpy x.x + - numpy - python x.x source: git_tag: v0.6rc1 -- cgit From 4fe08aedce73669d3225c8bbe8dbecc108d91133 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 29 Nov 2016 20:40:40 -0500 Subject: Improve recipe uniformity --- gwcs/meta.yaml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'gwcs') diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index 168098f..31fe8a8 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -1,12 +1,20 @@ +{% set name = 'gwcs' %} +{% set version = '0.6rc1' %} +{% set tag = 'v' + version %} +{% set number = '0' %} + about: - home: https://github.com/spacetelescope/gwcs + home: https://github.com/spacetelescope/{{name}} license: GPL - summary: gwcs + summary: Generalized World Coordinate System + build: - number: '0' + number: {{number}} + package: - name: gwcs - version: 0.6rc1 + name: {{name}} + version: {{version}} + requirements: build: - asdf @@ -19,9 +27,11 @@ requirements: - astropy >=1.1 - numpy - python x.x + source: - git_tag: v0.6rc1 - git_url: https://github.com/spacetelescope/gwcs + git_tag: {{tag}} + git_url: https://github.com/spacetelescope/{{name}}.git + test: imports: - gwcs -- cgit From f5f2cdfa9b94ae96f2c312758cdb87dcf74b2c4d Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 6 Dec 2016 13:54:28 -0500 Subject: Revert spaces around jinja2 variables --- gwcs/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gwcs') diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index 31fe8a8..d606a20 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -4,16 +4,16 @@ {% set number = '0' %} about: - home: https://github.com/spacetelescope/{{name}} + home: https://github.com/spacetelescope/{{ name }} license: GPL summary: Generalized World Coordinate System build: - number: {{number}} + number: {{ number }} package: - name: {{name}} - version: {{version}} + name: {{ name }} + version: {{ version }} requirements: build: @@ -29,8 +29,8 @@ requirements: - python x.x source: - git_tag: {{tag}} - git_url: https://github.com/spacetelescope/{{name}}.git + git_tag: {{ tag }} + git_url: https://github.com/spacetelescope/{{ name }}.git test: imports: -- cgit From 665a764b67153f7ed94ac472004ef5bf8ca06683 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 6 Dec 2016 15:29:54 -0500 Subject: Fix licenses --- gwcs/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gwcs') diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index d606a20..5b9a426 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -5,7 +5,7 @@ about: home: https://github.com/spacetelescope/{{ name }} - license: GPL + license: BSD summary: Generalized World Coordinate System build: -- cgit From ae68d66ae8cab18227fa65ba783f4d58ff7f9276 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 13 Dec 2016 15:31:37 -0500 Subject: Bump build numbers and meta-package versions --- gwcs/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gwcs') diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index 5b9a426..c70ca11 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'gwcs' %} {% set version = '0.6rc1' %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} -- cgit From cb386aa63813a7a7bd71016bc38477167822db33 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 5 Jan 2017 12:19:30 -0500 Subject: Fix merged-merge conflict --- gwcs/meta.yaml | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gwcs') diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index ee06516..c70ca11 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -12,14 +12,9 @@ build: number: {{ number }} package: -<<<<<<< HEAD name: {{ name }} version: {{ version }} -======= - name: gwcs - version: 0.7 ->>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f requirements: build: - asdf @@ -34,14 +29,9 @@ requirements: - python x.x source: -<<<<<<< HEAD git_tag: {{ tag }} git_url: https://github.com/spacetelescope/{{ name }}.git -======= - git_tag: 0.7 - git_url: https://github.com/spacetelescope/gwcs ->>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f test: imports: - gwcs -- cgit