summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release/2.6.4'2.6.4Timothy Crosley2015-05-073-5/+11
|\
| * Bump version to 2.6.4Timothy Crosley2015-05-073-5/+5
| * Merge pull request #42 from timothycrosley/feature/fix-issue-41Timothy Edmund Crosley2015-05-072-0/+6
| |\
| | * Fix syntax errorTimothy Crosley2015-05-071-1/+1
| | * Add environment markers, suggestion from @dstufftTimothy Crosley2015-05-072-0/+6
| |/
| * Merge tag '2.6.3' into developTimothy Crosley2014-12-253-5/+5
| |\ | |/ |/|
* | Merge branch 'release/2.6.3'2.6.3Timothy Crosley2014-12-254-5/+9
|\ \
| * | Bump release to 2.6.3Timothy Crosley2014-12-253-5/+5
| |/
| * Merge pull request #39 from timothycrosley/feature/fix-issue-30Timothy Edmund Crosley2014-12-251-0/+4
| |\
| | * Keep stdout and stderr reassignmentsTimothy Crosley2014-12-251-0/+4
| |/
| * Merge tag '2.6.2' into developTimothy Crosley2014-12-253-5/+5
| |\ | |/ |/|
* | Merge branch 'release/2.6.2'2.6.2Timothy Crosley2014-12-258-11/+29
|\ \
| * | Bump release to 2.6.2Timothy Crosley2014-12-253-5/+5
| |/
| * Merge pull request #38 from timothycrosley/feature/fix-issue-31Timothy Edmund Crosley2014-12-252-4/+1
| |\
| | * Update to use configparser instead of conflict with itTimothy Crosley2014-12-252-4/+1
| |/
| * Merge pull request #37 from timothycrosley/feature/fix-issue-36Timothy Edmund Crosley2014-12-251-1/+1
| |\
| | * Expose StringIO object within module correctlyTimothy Crosley2014-12-251-1/+1
| |/
| * Merge pull request #29 from acdha/patch-1Timothy Edmund Crosley2014-03-221-1/+1
| |\
| | * Fix StringIO on Python 3Chris Adams2014-03-221-1/+1
| |/
| * Merge pull request #27 from timothycrosley/feature/fix-issue-26Timothy Edmund Crosley2014-03-071-0/+1
| |\
| | * Add travis badge to piesTimothy Crosley2014-03-071-0/+1
| * | Merge pull request #25 from msabramo/travisTimothy Edmund Crosley2014-02-241-1/+10
| |\ \
| | * | .travis.yml: Run py.test, install pies2overrides for py2Marc Abramowitz2014-02-241-1/+10
| | |/
| * | Merge pull request #24 from msabramo/tox_use_local_pies2overridesTimothy Edmund Crosley2014-02-241-0/+11
| |\ \ | | |/ | |/|
| | * tox.ini: Install local pies2overridesMarc Abramowitz2014-02-241-0/+11
| |/
| * Merge tag '2.6.1' into developTimothy Crosley2014-02-244-9/+7
| |\ | |/ |/|
* | Merge branch 'release/2.6.1'2.6.1Timothy Crosley2014-02-249-12/+39
|\ \
| * | Disable wheel support till I determine correct way to change requirements per...Timothy Crosley2014-02-241-2/+0
| * | Improve commandTimothy Crosley2014-02-241-2/+2
| * | Bump version to 2.6.1Timothy Crosley2014-02-243-5/+5
| |/
| * Merge pull request #22 from msabramo/issue_21Timothy Edmund Crosley2014-02-242-2/+12
| |\
| | * Add tests.pyMarc Abramowitz2014-02-231-0/+7
| | * Fix GH-21 ("u function doesn't work on Python 2")Marc Abramowitz2014-02-231-2/+5
| |/ |/|
| * Merge pull request #20 from msabramo/toxTimothy Edmund Crosley2014-02-242-0/+19
| |\
| | * Add tox.iniMarc Abramowitz2014-02-232-0/+19
| * | Merge pull request #18 from dslackw/patch-1Timothy Edmund Crosley2014-02-101-1/+1
| |\ \ | | |/
| | * Update README.mdDimitris Zlatanidis2014-02-101-1/+1
| |/
| * Merge tag '2.6.0' into developTimothy Crosley2014-02-083-5/+5
| |\ | |/ |/|
* | Merge branch 'release/2.6.0'2.6.0Timothy Crosley2014-02-088-88/+102
|\ \
| * | Bump version to 2.6.0Timothy Crosley2014-02-083-5/+5
| |/
| * Set default encoding to utf8Timothy Crosley2014-02-081-0/+4
| * Merge pull request #17 from timothycrosley/feature/fix-issue-16Timothy Edmund Crosley2014-02-082-3/+13
| |\
| | * Manually determine instance type if not provided by abc in installed python v...Timothy Crosley2014-02-082-3/+13
| |/
| * Merge pull request #14 from timothycrosley/feature/license-badgeTimothy Edmund Crosley2014-01-231-1/+2
| |\
| | * Add license badgeTimothy Crosley2014-01-231-1/+2
| |/
| * Improve syntaxt to more closely match pep8 standard, in particular docstringsTimothy Crosley2014-01-145-79/+78
| * Merge tag '2.5.5' into developTimothy Crosley2014-01-143-5/+5
| |\ | |/ |/|
* | Merge branch 'release/2.5.5'2.5.5Timothy Crosley2014-01-145-14/+48
|\ \
| * | Bump version to 2.5.5Timothy Crosley2014-01-143-5/+5
| |/
| * Small typoTimothy Crosley2014-01-141-1/+1