Merge branch 'develop'

ymyzk · Sep 24, 2016 · fa1ee0f · fa1ee0f
2 parents be5936d + 7e16170
commit fa1ee0f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Yusuke Miyazaki
+Copyright (c) 2015-2016 Yusuke Miyazaki
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.rst b/README.rst
@@ -44,7 +44,7 @@ Requirements
 Python
 ^^^^^^
 * Python 2.7+
-* Python 3.2+
+* Python 3.3+
 * PyPy
 * PyPy3
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.0'
+version = '0.6.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.0'
+release = '0.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -20,7 +20,7 @@ Requirements
 Python
 ^^^^^^
 * Python 2.7+
-* Python 3.2+
+* Python 3.3+
 * PyPy
 * PyPy3
 

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
     from distutils.core import setup
 
 
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
     README = readme.read()
@@ -43,7 +43,6 @@
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.2',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py32,py33,py34,pypy,pypy3}-django{17,18}, {py27,py34,py35,pypy}-django19, coverage, docs, flake8
+envlist = {py27,py33,py34,pypy,pypy3}-django{17,18}, {py27,py34,py35,pypy}-django19, coverage, docs, flake8
 
 [testenv]
 deps =
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ Requirements @@
     Python
     ^^^^^^
     * Python 2.7+
-    * Python 3.2+
+    * Python 3.3+
     * PyPy
     * PyPy3
@@ Expand Down @@