From 11465d907d25f517b8f6b88eb6bcf26b4538270f Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@quantopian.com>
Date: Tue, 16 Feb 2016 12:54:19 -0500
Subject: [PATCH 1/2] MAINT: Upgrade Logbook version

Upgrade Logbook to 0.12.5. This required changing a usage of
`logbook.NullHandler()` which passed `bubble=True`, since
`NullHandler` no longer supports the `bubble` argument.
---
 etc/requirements.txt      | 2 +-
 zipline/examples/olmar.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/requirements.txt b/etc/requirements.txt
index 4b17de47..cdfe7dd4 100644
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -2,7 +2,7 @@
 pip>=7.1.0
 
 # Logging
-Logbook==0.10.0
+Logbook==0.12.5
 
 # Scientific Libraries
 
diff --git a/zipline/examples/olmar.py b/zipline/examples/olmar.py
index 73950523..9294ea35 100644
--- a/zipline/examples/olmar.py
+++ b/zipline/examples/olmar.py
@@ -9,7 +9,7 @@ from zipline.utils.factory import load_from_yahoo
 from zipline.finance import commission
 
 zipline_logging = logbook.NestedSetup([
-    logbook.NullHandler(level=logbook.DEBUG, bubble=True),
+    logbook.NullHandler(),
     logbook.StreamHandler(sys.stdout, level=logbook.INFO),
     logbook.StreamHandler(sys.stderr, level=logbook.ERROR),
 ])

From 740bc4a5206917e4d16ae4f661333d5781b46d59 Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@quantopian.com>
Date: Tue, 16 Feb 2016 14:40:00 -0500
Subject: [PATCH 2/2] BLD: Update conda meta for logbook 0.12.5

---
 conda/logbook/meta.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/conda/logbook/meta.yaml b/conda/logbook/meta.yaml
index 228de950..eec5e5bc 100644
--- a/conda/logbook/meta.yaml
+++ b/conda/logbook/meta.yaml
@@ -1,11 +1,11 @@
 package:
   name: logbook
-  version: "0.10.0"
+  version: "0.12.5"
 
 source:
-  fn: Logbook-0.10.0.tar.gz
-  url: https://pypi.python.org/packages/source/L/Logbook/Logbook-0.10.0.tar.gz
-  md5: 92439ce6f71f3120d65d84c2a3ab5047
+  fn: Logbook-0.12.5.tar.gz
+  url: https://pypi.python.org/packages/source/L/Logbook/Logbook-0.12.5.tar.gz
+  md5: 1bf64289b9b4cada5a61817c63dd9e82
 #  patches:
    # List any patch files here
    # - fix.patch
@@ -30,11 +30,9 @@ requirements:
   build:
     - python
     - setuptools
-    - six >=1.4.0
 
   run:
     - python
-    - six >=1.4.0
 
 test:
   # Python imports