From 25275f2a905e823f4f83064ad8ee662665be4583 Mon Sep 17 00:00:00 2001
From: Chris Brackert <cbrackert@gmail.com>
Date: Wed, 21 Oct 2015 14:44:33 -0700
Subject: [PATCH] Bump version to 2.2.3

---
 CHANGES.txt         |  1 +
 MANIFEST.in         |  1 +
 docs/source/conf.py |  4 ++--
 setup.py            | 17 ++---------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b1db2ea..b92644f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -93,3 +93,4 @@ v2.2.2  11/19/15 -- Add error_callback function to XBeeBase
                      when an unexpected Exception (not ThreadQuitException) is raised
                      while waiting for serial data. This generally indicates that the XBee
                      serial interface needs to be reconnected.
+v2.2.3  11/21/15 --  Fix README for GitHub and PyPI
diff --git a/MANIFEST.in b/MANIFEST.in
index 74283ae..45a216a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
+include README.rst
 include *.txt
 include *.py
 recursive-include docs *.*
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 62b9089..ca54505 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -45,9 +45,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.2'
+version = '2.2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.2'
+release = '2.2.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 813f9b5..e58c2e0 100644
--- a/setup.py
+++ b/setup.py
@@ -8,22 +8,9 @@
     'xbee.helpers.dispatch.tests',
 ]
 
-try:
-    from pypandoc import convert
-    def read_md(f):
-        try:
-            return convert(f, 'rst')
-        except Exception as e:
-            print("warning: pypandoc module not found,"
-                  " not converting Markdown to RST")
-            print(e)
-except ImportError:
-    print("warning: pypandoc module not found, not converting Markdown to RST")
-    read_md = lambda f: open(f, 'r').read()
-
 setup(
     name='XBee',
-    version='2.2.2',
+    version='2.2.3',
     author='Paul Malmsten',
     author_email='pmalmsten@gmail.com',
     packages=packages,
@@ -31,7 +18,7 @@ def read_md(f):
     url='https://github.com/nioinnovation/python-xbee',
     license='LICENSE.txt',
     description='Python tools for working with XBee radios',
-    long_description=read_md('README.md'),
+    long_description=open('README.rst').read(),
     requires=['serial'],
     provides=packages,
 )