From 1296d597f1da77269a6972249d31cd9be1b7607d Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Wed, 25 May 2016 23:52:06 -0400
Subject: More logical versioning for astropy (requires constant fixing)

---
 astropy/meta.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/astropy/meta.yaml b/astropy/meta.yaml
index e8856f0..5ad60e3 100644
--- a/astropy/meta.yaml
+++ b/astropy/meta.yaml
@@ -1,7 +1,6 @@
 {% set name = 'astropy' %}
-{% set version = environ.get("GIT_DESCRIBE_NUMBER", "0") %}
+{% set version = '1.2dev' + environ.get("GIT_DESCRIBE_NUMBER", "0") %}
 {% set number = '0' %}
-{% set build_string = environ.get("GIT_DESCRIBE_HASH", "NOHASH") + "_" + number %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -9,7 +8,6 @@ about:
     summary: Astropy is a package intended to contain much of the core functionality and some common tools needed for performing astronomy and astrophysics with Python.
 build:
     number: {{ number }}
-    string: {{ build_string }}
 package:
     name: {{ name }}
     version: {{ version }}
-- 
cgit