From be1defea901e51c386beb056a649ff29925e6bb3 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 8 Aug 2012 18:20:05 +0900
Subject: minimal coverage config

still needing some love for the --include part in
the html report.
---
 src/leap/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index e69de29b..a7ae10e3 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -0,0 +1,5 @@
+from leap import eip
+from leap import baseapp
+from leap import util
+
+__all__ = [eip, baseapp, util]
-- 
cgit v1.2.3


From ea13e9a04786fbb6c461690097361e48e8ca94ce Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 13 Sep 2012 03:22:31 +0900
Subject: add versioneer

---
 src/leap/__init__.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index a7ae10e3..75bddd6d 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,5 +1,30 @@
+"""
+LEAP Encryption Access Project
+website: U{https://leap.se/}
+"""
+
 from leap import eip
 from leap import baseapp
 from leap import util
 
 __all__ = [eip, baseapp, util]
+
+__version__ = "unknown"
+try:
+    from ._version import get_versions
+    __version__ = get_versions()['version']
+    del get_versions
+except ImportError:
+    #running on a tree that has not run
+    #the setup.py setver
+    pass
+
+__appname__ = "unknown"
+try:
+    from leap._appname import __appname__
+except ImportError:
+    #running on a tree that has not run
+    #the setup.py setver
+    pass
+
+__full_version__ = __appname__ + '/' + str(__version__)
-- 
cgit v1.2.3


From 0d35f2a82bf15504ace2135af3e0c66ae1c16874 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 18 Sep 2012 11:11:43 +0900
Subject: do_branding command added to setup

---
 src/leap/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 75bddd6d..5e003931 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -28,3 +28,8 @@ except ImportError:
     pass
 
 __full_version__ = __appname__ + '/' + str(__version__)
+
+try:
+    from leap._branding import BRANDING as __branding
+except ImportError:
+    __branding = {}
-- 
cgit v1.2.3


From b4af406e6cf233d939e3dfa5b5c9b2241b6d8ea0 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 27 Dec 2012 03:09:34 +0900
Subject: import fixes for soledad

---
 src/leap/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 5e003931..2adbb34a 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -6,8 +6,9 @@ website: U{https://leap.se/}
 from leap import eip
 from leap import baseapp
 from leap import util
+from leap import soledad
 
-__all__ = [eip, baseapp, util]
+__all__ = [eip, baseapp, util, soledad]
 
 __version__ = "unknown"
 try:
-- 
cgit v1.2.3


From 8ddd01b8f5bcc14fb7a51bfb95d0eacc83db640e Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 30 Jan 2013 09:00:06 +0900
Subject: remove remaining soledad import

---
 src/leap/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 2adbb34a..0e880867 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -6,10 +6,9 @@ website: U{https://leap.se/}
 from leap import eip
 from leap import baseapp
 from leap import util
-from leap import soledad
-
-__all__ = [eip, baseapp, util, soledad]
+#from leap import soledad
 
+__all__ = [eip, baseapp, util]
 __version__ = "unknown"
 try:
     from ._version import get_versions
-- 
cgit v1.2.3