Skip to content

Commit

Permalink
MRG: Merge branch 'release/0.3.11'
Browse files Browse the repository at this point in the history
* release/0.3.11:
  DOC: HISTORY.rst: git-changelog.py --hdr=+ --rev 'release/0.3.11' | pbcopy
  RLS,DOC: setup.py,pyline.py: version 0.3.11
  BLD: tox.ini, requirements.txt: add jinja2 to requirements.txt
  BLD: tox.ini: testenv/deps/jinja2
  • Loading branch information
westurner committed Feb 15, 2016
2 parents aa2529a + efc24ce commit 9c05df0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
20 changes: 17 additions & 3 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,24 @@ History



release/0.3.10 (2016-02-14 21:55:05 -0600)

release/0.3.11 (2016-02-14 22:07:45 -0600)
++++++++++++++++++++++++++++++++++++++++++
::

git log --reverse --pretty=format:'* %s [%h]' v0.3.9..release/0.3.10
git log --reverse --pretty=format:'* %s [%h]' v0.3.10..release/0.3.11

* MRG: Merge tag 'v0.3.10' into develop [ed296ea]
* BLD: tox.ini: testenv/deps/jinja2 [1a6c2f5]
* BLD: tox.ini, requirements.txt: add jinja2 to requirements.txt [e267a1e]
* RLS,DOC: setup.py,pyline.py: version 0.3.11 [21bd6e9]


v0.3.10 (2016-02-14 21:56:36 -0600)
+++++++++++++++++++++++++++++++++++
::

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

* MRG: Merge tag 'v0.3.9' into develop [f7c8a16]
* BUG,UBY: pyline.py: logging config (default INFO, -q/--quiet, -v/--verbose (DEBUG)) [8a060ab]
Expand All @@ -19,6 +32,8 @@ release/0.3.10 (2016-02-14 21:55:05 -0600)
* BUG,REF: opts['cmd'], main->(int, results[]), log opts after all config [3cf9585]
* UBY: pyline.py: log.info(('_rgx', _regexstr)) [02bd234]
* RLS,DOC: setup.py,pyline.py: version 0.3.10 [ea6a1fd]
* DOC: HISTORY.rst: git-changelog.py --hdr=+ --rev 'release/0.3.10' | pbcopy [5266662]
* MRG: Merge branch 'release/0.3.10' [aa2529a]


v0.3.9 (2016-02-14 17:58:36 -0600)
Expand Down Expand Up @@ -290,7 +305,6 @@ v0.1.0 (2014-05-12 04:03:15 -0500)




0.0.1 (Unreleased)
+++++++++++++++++++
| Source: http://code.activestate.com/recipes/437932-pyline-a-grep-like-sed-like-command-line-tool/
Expand Down
2 changes: 1 addition & 1 deletion 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.10"
__version__ = version = "0.3.11"

import cgi
import csv
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
wheel==0.22.0
pathlib
path.py
jinja2
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.10',
version='0.3.11',
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 9c05df0

Please sign in to comment.