From c49d818068c881e0f319695051fd2cfa2ed1296e Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@redhat.com>
Date: Mon, 14 Jul 2014 11:18:52 -0400
Subject: [PATCH] Release 1.1.0

---
 TODO.txt                           | 5 ++++-
 setup.py                           | 5 +++--
 tests/python/test-requirements.txt | 4 ++++
 tox.ini                            | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 7d54ccd..26ffa96 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,9 +3,12 @@ Known Bugs:
 
 None.
 
+Release 1.1.0 Notes:
+--------------------
+Added: Gordon Sim added support for configuring sender settle modes.
+
 Release 1.0.1 Notes:
 --------------------
-
 Fixed: No further endpoint callbacks once application destroys it.
 Fixed: aborting pending message must not call back until Connection.process() is called.
 Added: message send timeout.
diff --git a/setup.py b/setup.py
index 830959f..33d0ea2 100644
--- a/setup.py
+++ b/setup.py
@@ -17,10 +17,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-from distutils.core import setup
+from setuptools import setup
 
 setup(name="pyngus",
-      version="1.0.0",
+      version="1.1.0",
       author="kgiusti",
       author_email="kgiusti@apache.org",
       packages=["pyngus"],
@@ -28,6 +28,7 @@ setup(name="pyngus",
       description="Callback API implemented over Proton",
       url="https://github.com/kgiusti/pyngus",
       license="Apache Software License",
+      # install_requires=['python-qpid-proton>=0.7,<0.8'],
       classifiers=["License :: OSI Approved :: Apache Software License",
                    "Intended Audience :: Developers",
                    "Operating System :: OS Independent",
diff --git a/tests/python/test-requirements.txt b/tests/python/test-requirements.txt
index dc8e5a9..12c077d 100644
--- a/tests/python/test-requirements.txt
+++ b/tests/python/test-requirements.txt
@@ -1,3 +1,7 @@
 pep8>=1.4.5
 pyflakes>=0.7.3
 flake8>=2.1.0
+
+# This requires that qpid-proton-c-devel packages
+# are installed on your system:
+python-qpid-proton>=0.7,<0.8
diff --git a/tox.ini b/tox.ini
index 111a44d..b03d6e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 # Proton does not support Python3 yet: see Jira PROTON-490
 #envlist = py27,py33,pep8
-envlist = py27,pep8
+envlist = py26,py27,pep8
 
 [testenv]
 deps = -r{toxinidir}/tests/python/test-requirements.txt