Skip to content

Commit

Permalink
MRG: Merge branch 'hotfix/0.3.16'
Browse files Browse the repository at this point in the history
* hotfix/0.3.16:
  DOC: HISTORY.rst: git-changelog.py
  RLS: pyline v0.3.16
  BUG: pyline.py: sys.argv[1:] (#7)
  • Loading branch information
westurner committed Jul 22, 2016
2 parents 2225fd6 + 9725f8d commit c18d61c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
18 changes: 15 additions & 3 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,30 @@ History



release/0.3.15 (2016-07-22 11:32:35 -0500)
++++++++++++++++++++++++++++++++++++++++++
hotfix/0.3.16 (2016-07-22 11:41:13 -0500)
+++++++++++++++++++++++++++++++++++++++++
::

git log --reverse --pretty=format:'* %s [%h]' v0.3.14..release/0.3.15
git log --reverse --pretty=format:'* %s [%h]' v0.3.15..hotfix/0.3.16

* BUG: pyline.py: sys.argv\[1:\] (#7) \[a548405\]
* RLS: pyline v0.3.16 \[b17153a\]


v0.3.15 (2016-07-22 11:34:56 -0500)
+++++++++++++++++++++++++++++++++++
::

git log --reverse --pretty=format:'* %s [%h]' v0.3.14..v0.3.15

* MRG: Merge tag 'v0.3.12' into develop \[b4a3ec7\]
* BUG: include files named \s+ with -p/--pathpy or --pathlib (fixes #24) \[6c3f658\]
* MRG: Merge tag 'v0.3.13' into develop \[1f2b64b\]
* MRG: Merge tag 'v0.3.14' into develop \[b27731a\]
* ETC: pyline/__init__.py: __version__ = version = pyline.version \[4065820\]
* RLS: setup.py, pyline.py: version='0.3.15' \[a83ad49\]
* DOC: HISTORY.rst: git-changelog.py -r "release/0.3.15" --hdr="+"\` \[cfd26be\]
* MRG: Merge branch 'release/0.3.15' \[2225fd6\]


v0.3.14 (2016-07-22 11:27:03 -0500)
Expand Down
4 changes: 2 additions & 2 deletions pyline/pyline.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def backwards(line):
"""

__version__ = version = "0.3.15"
__version__ = version = "0.3.16"

import cgi
import csv
Expand Down Expand Up @@ -1250,7 +1250,7 @@ def main(args=None, iterable=None, output=None, results=None, opts=None):

def main_entrypoint():
import sys
retval, _ = main(args=sys.argv[0:])
retval, _ = main(args=sys.argv[1:])
sys.exit(retval)


Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def build_long_description():

setup(
name='pyline',
version='0.3.15',
version='0.3.16',
description=(
'Pyline is a grep-like, sed-like, awk-like command-line tool '
'for line-based text processing in Python.'),
Expand Down

0 comments on commit c18d61c

Please sign in to comment.