From 0acf4bca0d9e6534a83a889143358c804f649818 Mon Sep 17 00:00:00 2001
From: Matt Wright <matt@localprojects.net>
Date: Wed, 4 Apr 2012 12:16:00 -0400
Subject: [PATCH] remove __version__ because it was causing problems with
 installation from pypi

---
 docs/conf.py               | 4 ++--
 flask_security/__init__.py | 2 --
 setup.py                   | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 923068b..17cae5d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ import sys, os
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.append(os.path.abspath('_themes'))
-from flask_security import __version__
+#from setup import __version__
 
 # -- General configuration -----------------------------------------------------
 
@@ -50,7 +50,7 @@ copyright = u'2012, Matt Wright'
 # built documents.
 #
 # The short X.Y version.
-version = __version__
+version = '1.2.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/flask_security/__init__.py b/flask_security/__init__.py
index dad315f..49a98bb 100644
--- a/flask_security/__init__.py
+++ b/flask_security/__init__.py
@@ -10,8 +10,6 @@
     :license: MIT, see LICENSE for more details.
 """
 
-__version__ = '1.2.1'
-
 import sys
 
 from datetime import datetime
diff --git a/setup.py b/setup.py
index f609903..cfdf948 100644
--- a/setup.py
+++ b/setup.py
@@ -12,12 +12,12 @@ Links
   <https://github.com/mattupstate/flask-security/raw/develop#egg=Flask-Security-dev>`_
 
 """
-from flask_security import __version__
+
 from setuptools import setup
 
 setup(
     name='Flask-Security',
-    version=__version__,
+    version='1.2.1',
     url='https://github.com/mattupstate/flask-security',
     license='MIT',
     author='Matthew Wright',