From 73978ffeb7c2721b25add9c4f8000a1a3327b180 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Mon, 28 Apr 2014 14:26:21 -0700
Subject: [PATCH 1/3] Allow config file to prevent logging configuration from
 happening.

---
 edbob/initialization.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/edbob/initialization.py b/edbob/initialization.py
index 410b572..af2aeff 100644
--- a/edbob/initialization.py
+++ b/edbob/initialization.py
@@ -89,7 +89,8 @@ def init(appname='edbob', *args, **kwargs):
         shell = kwargs.get('shell', False)
         for paths in config_paths:
             config.read(paths, recurse=not shell)
-    config.configure_logging()
+    if config.getboolean('edbob', 'configure_logging', default=True):
+        config.configure_logging()
 
     default_modules = 'edbob.time'
     modules = config.get('edbob', 'init', default=default_modules)

From 8fabdf8b72af2ced5893643e30371e9517ef6a76 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Mon, 28 Apr 2014 14:27:32 -0700
Subject: [PATCH 2/3] update changelog

---
 CHANGES.txt       | 6 ++++++
 edbob/_version.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 688705d..8bfbfbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,10 @@
 
+0.1.2
+-----
+
+* Allow config file to prevent logging configuration from happening.
+
+
 0.1.1
 -----
 
diff --git a/edbob/_version.py b/edbob/_version.py
index df9144c..10939f0 100644
--- a/edbob/_version.py
+++ b/edbob/_version.py
@@ -1 +1 @@
-__version__ = '0.1.1'
+__version__ = '0.1.2'

From a0b35dfadba1fe61c48edc0b1bcaa460a470ce07 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Mon, 28 Apr 2014 14:28:54 -0700
Subject: [PATCH 3/3] Remove custom PyPI stuff from Fabric `release` task.

---
 fabfile.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index 4e02e11..1eb4728 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -22,27 +22,15 @@
 #
 ################################################################################
 
-import os.path
 import shutil
 
 from fabric.api import *
 
 
-execfile(os.path.join(os.path.dirname(__file__), 'edbob', '_version.py'))
-
-
 @task
 def release():
     """
     Release a new version of 'edbob'.
     """
-
     shutil.rmtree('edbob.egg-info')
     local('python setup.py sdist --formats=gztar register upload')
-
-    filename = 'edbob-{0}.tar.gz'.format(__version__)
-
-    put(os.path.join('dist', filename), '/srv/pypi/{0}'.format(filename))
-    with cd('/srv/pypi'):
-        run('rm --recursive --force simple')
-        run('compoze index')