Merge branch 'hotfix/0.3.6'

* hotfix/0.3.6: RLS: HISTORY.rst, __init__.py, pyline.py, setup.py: __version__ = '0.3.6' BUG: pyline.py: #!/usr/bin/env python2
westurner · Dec 21, 2015 · 445c089 · 445c089
2 parents 065797d + a463d39
commit 445c089
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,10 @@
 History
 =========
 
+0.3.6 (2015-12-21)
+++++++++++++++++++++
+* BUG: pyline.py: #!/usr/bin/env python2 [9729816]
+
 0.3.5 (2015-05-24)
 +++++++++++++++++++
 * BUG,DOC: pyline.py: set default regex_options to '', optparse helpstrings [fa9e9cb]

diff --git a/pyline/__init__.py b/pyline/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = '0.3.5'
+__version__ = '0.3.6'
 
 import pyline
 

diff --git a/pyline/pyline.py b/pyline/pyline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 """
@@ -71,6 +71,8 @@ def backwards(line):
 
 """
 
+__version__ = version = "0.3.6"
+
 import cgi
 import csv
 import collections

diff --git a/setup.py b/setup.py
@@ -73,7 +73,7 @@ def build_long_description():
 
 setup(
     name='pyline',
-    version='0.3.5',
+    version='0.3.6',
     description=(
         'A grep-like, sed-like command-line tool for line-based '
         'processing in Python.'),