Merge branch 'master' into alex-patch-1

.travis.yml

@@ -7,14 +7,12 @@ env:
   # support the compiler directive with language: python.
   - TOXENV=py26 CC=gcc
   - TOXENV=py27 CC=gcc
-  - TOXENV=py32 CC=gcc
   - TOXENV=py33 CC=gcc
   - TOXENV=py34 CC=gcc
   - TOXENV=py35 CC=gcc
   - TOXENV=pypy CC=gcc
   - TOXENV=py26 CC=clang
   - TOXENV=py27 CC=clang
-  - TOXENV=py32 CC=clang
   - TOXENV=py33 CC=clang
   - TOXENV=py34 CC=clang
   - TOXENV=py35 CC=clang

README.rst

@@ -1,7 +1,7 @@
 bcrypt
 ======
 
-.. image:: https://img.shields.io/pypi/v/bcrypt.svg 
+.. image:: https://img.shields.io/pypi/v/bcrypt.svg
     :target: https://pypi.python.org/pypi/bcrypt/
     :alt: Latest Version
 
@@ -89,7 +89,7 @@ Compatibility
 -------------
 
 This library should be compatible with py-bcrypt and it will run on Python
-2.6+, 3.2+, and PyPy.
+2.6+, 3.3+, and PyPy.
 
 Security
 --------

setup.py

@@ -217,8 +217,8 @@ def run_tests(self):
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
     ],
 
     ext_package="bcrypt",

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py32,py33,py34,py35,pep8,py3pep8
+envlist = py26,py27,pypy,py33,py34,py35,pep8,py3pep8
 
 [testenv]
 # If you add a new dep here you probably need to add it in setup.py as well