From 528dc7a4e96ba0ebfec3b962d2b4b15aa4592704 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Wed, 18 Feb 2015 12:56:29 +0000
Subject: [PATCH] Revert "Versioning changes"

---
 docs/conf.py                    |  2 +-
 setup.py                        |  2 +-
 wagtail/__init__.py             |  4 --
 wagtail/utils/version.py        | 84 ---------------------------------
 wagtail/wagtailcore/__init__.py |  4 +-
 5 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 wagtail/utils/version.py

diff --git a/docs/conf.py b/docs/conf.py
index 5e64326671..b8ff46164c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -30,7 +30,7 @@ if not on_rtd:  # only import and set the theme if we're building docs locally
 sys.path.insert(0, os.path.abspath('..'))
 
 # Get Wagtail version
-from wagtail import __version__
+from wagtail.wagtailcore import __version__
 
 # Autodoc may need to import some models modules which require django settings
 # be configured
diff --git a/setup.py b/setup.py
index a70d1d5b5c..ee86409bbc 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 import sys, os
 
-from wagtail import __version__
+from wagtail.wagtailcore import __version__
 
 
 try:
diff --git a/wagtail/__init__.py b/wagtail/__init__.py
index b3b462a9fa..e69de29bb2 100644
--- a/wagtail/__init__.py
+++ b/wagtail/__init__.py
@@ -1,4 +0,0 @@
-from wagtail.utils.version import get_version
-
-VERSION = (0, 9, 0, 'alpha', 0)
-__version__ = get_version(VERSION)
diff --git a/wagtail/utils/version.py b/wagtail/utils/version.py
deleted file mode 100644
index f3991332e8..0000000000
--- a/wagtail/utils/version.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# https://raw.githubusercontent.com/django/django/master/django/utils/version.py
-# This was copied into Wagtail so the get_git_changeset will use a file located in Wagtail instead of Django
-
-from __future__ import unicode_literals
-
-import datetime
-import os
-import subprocess
-
-from django.utils.lru_cache import lru_cache
-
-
-def get_version(version=None):
-    "Returns a PEP 386-compliant version number from VERSION."
-    version = get_complete_version(version)
-
-    # Now build the two parts of the version number:
-    # major = X.Y[.Z]
-    # sub = .devN - for pre-alpha releases
-    #     | {a|b|c}N - for alpha, beta and rc releases
-
-    major = get_major_version(version)
-
-    sub = ''
-    if version[3] == 'alpha' and version[4] == 0:
-        git_changeset = get_git_changeset()
-        if git_changeset:
-            sub = '.dev%s' % git_changeset
-
-    elif version[3] != 'final':
-        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}
-        sub = mapping[version[3]] + str(version[4])
-
-    return str(major + sub)
-
-
-def get_major_version(version=None):
-    "Returns major version from VERSION."
-    version = get_complete_version(version)
-    parts = 2 if version[2] == 0 else 3
-    major = '.'.join(str(x) for x in version[:parts])
-    return major
-
-
-def get_complete_version(version=None):
-    """Returns a tuple of the wagtail version. If version argument is non-empty,
-    then checks for correctness of the tuple provided.
-    """
-    if version is None:
-        from wagtail import VERSION as version
-    else:
-        assert len(version) == 5
-        assert version[3] in ('alpha', 'beta', 'rc', 'final')
-
-    return version
-
-
-def get_docs_version(version=None):
-    version = get_complete_version(version)
-    if version[3] != 'final':
-        return 'dev'
-    else:
-        return '%d.%d' % version[:2]
-
-
-@lru_cache()
-def get_git_changeset():
-    """Returns a numeric identifier of the latest git changeset.
-
-    The result is the UTC timestamp of the changeset in YYYYMMDDHHMMSS format.
-    This value isn't guaranteed to be unique, but collisions are very unlikely,
-    so it's sufficient for generating the development version numbers.
-    """
-    repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    git_log = subprocess.Popen('git log --pretty=format:%ct --quiet -1 HEAD',
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-            shell=True, cwd=repo_dir, universal_newlines=True)
-    timestamp = git_log.communicate()[0]
-    try:
-        timestamp = datetime.datetime.utcfromtimestamp(int(timestamp))
-    except ValueError:
-        return None
-    return timestamp.strftime('%Y%m%d%H%M%S')
-
diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/wagtailcore/__init__.py
index 6b9b8907d4..fbeaf156c6 100644
--- a/wagtail/wagtailcore/__init__.py
+++ b/wagtail/wagtailcore/__init__.py
@@ -1,4 +1,2 @@
+__version__ = '0.9.dev0'
 default_app_config = 'wagtail.wagtailcore.apps.WagtailCoreAppConfig'
-
-# Import Wagtail version so Django debug toolbar can see it
-from wagtail import __version__