From 4d608d25a9d2e5cd3fa16e55a961e941d7f77c1e Mon Sep 17 00:00:00 2001
From: Adam Gschwender <adam.gschwender@gmail.com>
Date: Thu, 20 Apr 2017 15:21:25 -0400
Subject: [PATCH] Bump version to 1.2.3

Update README to reflect new user_agent option
---
 CHANGES.txt        | 1 +
 README.rst         | 7 ++++---
 pilbox/__init__.py | 5 +++--
 setup.py           | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d969653..cd69600 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -53,3 +53,4 @@
     - *Backwards incompatible*: default background property changed to `0fff`. To restore previous behavior, set background in config to `ffff`.
   * 1.2.1: Added max operations config property
   * 1.2.2: Added max resize width and height config properties
+  * 1.2.3: Added user_agent option
diff --git a/README.rst b/README.rst
index 47e2778..561318b 100644
--- a/README.rst
+++ b/README.rst
@@ -152,8 +152,8 @@ To see a list of all available options, run
       --quality                  default jpeg quality, 1-99 or keep
       --retain                   default adaptive retain percent, 1-99
       --timeout                  timeout of requests in seconds (default 10)
-      --validate_cert            validate certificates (default True)
       --user_agent               user agent
+      --validate_cert            validate certificates (default True)
 
 
 Calling
@@ -628,5 +628,6 @@ Changelog
      ``0fff``. To restore previous behavior, set background in config
      to ``ffff``.
 
--   1.2.1: Added max operations config property
--   1.2.2: Added max resize width and height config properties
+-  1.2.1: Added max operations config property
+-  1.2.2: Added max resize width and height config properties
+-  1.2.3: Added user_agent option
diff --git a/pilbox/__init__.py b/pilbox/__init__.py
index e4e4c2f..ff17144 100644
--- a/pilbox/__init__.py
+++ b/pilbox/__init__.py
@@ -76,13 +76,14 @@
        to `ffff`.
   * 1.2.1: Added max operations config property
   * 1.2.2: Added max resize width and height config properties
+  * 1.2.3: Added user_agent option
 """
 
 # human-readable version number
-version = "1.2.2"
+version = "1.2.3"
 
 # The first three numbers are the components of the version number.
 # The fourth is zero for an official release, positive for a development
 # branch, or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version_info = (1, 2, 2, 0)
+version_info = (1, 2, 3, 0)
diff --git a/setup.py b/setup.py
index e3c1679..54fba56 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def run(self):
 
 
 setup(name='pilbox',
-      version='1.2.2',
+      version='1.2.3',
       description='Pilbox is an image processing application server built on the Tornado web framework using the Pillow Imaging Library',
       long_description=readme,
       classifiers=[