Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #57 from ofir123/python26-fixesHEADdevelop | Timothy Edmund Crosley | 2016-03-26 | 1 | -7/+12 |
|\ | |||||
| * | Fixed some Python 2.6 and IPython issues. | Ofir123 | 2016-01-11 | 1 | -7/+12 |
|/ | |||||
* | Merge pull request #53 from AbsoluteMSTR/patch-3 | Timothy Edmund Crosley | 2015-09-14 | 1 | -1/+149 |
|\ | |||||
| * | backport collection.ChainMap | Ankur Dedania | 2015-08-19 | 1 | -1/+149 |
|/ | |||||
* | Merge pull request #51 from AbsoluteMSTR/patch-1 | Timothy Edmund Crosley | 2015-08-13 | 1 | -1/+1 |
|\ | |||||
| * | fix lru_cache typo | Ankur Dedania | 2015-08-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #50 from AbsoluteMSTR/develop | Timothy Edmund Crosley | 2015-08-13 | 1 | -51/+163 |
|\ | |||||
| * | modified lru_cache to mimic python 3.3+ | Ankur Dedania | 2015-08-13 | 1 | -51/+163 |
|/ | |||||
* | Merge tag '2.6.7' into develop | Timothy Crosley | 2015-07-12 | 3 | -5/+5 |
|\ | |||||
| * | Merge branch 'release/2.6.7'2.6.7master | Timothy Crosley | 2015-07-12 | 5 | -27/+9 |
| |\ | |||||
| | * | Update release to 2.6.7 | Timothy Crosley | 2015-07-12 | 3 | -5/+5 |
| |/ |/| | |||||
* | | Merge pull request #47 from timothycrosley/feature/fix-issue-43 | Timothy Edmund Crosley | 2015-07-12 | 2 | -4/+1 |
|\ \ | |||||
| * | | Remove _thread module to resolve compatibility issues with other libraries | Timothy Crosley | 2015-07-12 | 2 | -4/+1 |
|/ / | |||||
* | | Merge pull request #46 from timothycrosley/feature/fix-python-3-compat | Timothy Edmund Crosley | 2015-07-12 | 2 | -17/+2 |
|\ \ | |||||
| * | | Remove install requirements that are version specific, keep them in extra req...feature/fix-python-3-compat | Timothy Crosley | 2015-07-12 | 2 | -17/+2 |
* | | | Merge pull request #45 from patrickyevsukov/patch-1 | Timothy Edmund Crosley | 2015-07-12 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix Typo | Patrick Yevsukov | 2015-06-11 | 1 | -1/+1 |
|/ / | |||||
* | | Merge tag '2.6.5' into develop | Timothy Crosley | 2015-05-07 | 4 | -5/+7 |
|\ \ | |/ | |||||
| * | Merge branch 'release/2.6.5'2.6.5 | Timothy Crosley | 2015-05-07 | 4 | -5/+7 |
| |\ | |||||
| | * | Update distribute command to include wheel generation | Timothy Crosley | 2015-05-07 | 1 | -0/+2 |
| | * | Bump version to 2.6.5 | Timothy Crosley | 2015-05-07 | 3 | -5/+5 |
| |/ |/| | |||||
* | | Merge tag '2.6.4' into develop | Timothy Crosley | 2015-05-07 | 3 | -5/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'release/2.6.4'2.6.4 | Timothy Crosley | 2015-05-07 | 3 | -5/+11 |
| |\ | |||||
| | * | Bump version to 2.6.4 | Timothy Crosley | 2015-05-07 | 3 | -5/+5 |
| |/ |/| | |||||
* | | Merge pull request #42 from timothycrosley/feature/fix-issue-41 | Timothy Edmund Crosley | 2015-05-07 | 2 | -0/+6 |
|\ \ | |||||
| * | | Fix syntax error | Timothy Crosley | 2015-05-07 | 1 | -1/+1 |
| * | | Add environment markers, suggestion from @dstufft | Timothy Crosley | 2015-05-07 | 2 | -0/+6 |
|/ / | |||||
* | | Merge tag '2.6.3' into develop | Timothy Crosley | 2014-12-25 | 3 | -5/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'release/2.6.3'2.6.3 | Timothy Crosley | 2014-12-25 | 4 | -5/+9 |
| |\ | |||||
| | * | Bump release to 2.6.3 | Timothy Crosley | 2014-12-25 | 3 | -5/+5 |
| |/ |/| | |||||
* | | Merge pull request #39 from timothycrosley/feature/fix-issue-30 | Timothy Edmund Crosley | 2014-12-25 | 1 | -0/+4 |
|\ \ | |||||
| * | | Keep stdout and stderr reassignments | Timothy Crosley | 2014-12-25 | 1 | -0/+4 |
|/ / | |||||
* | | Merge tag '2.6.2' into develop | Timothy Crosley | 2014-12-25 | 3 | -5/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'release/2.6.2'2.6.2 | Timothy Crosley | 2014-12-25 | 8 | -11/+29 |
| |\ | |||||
| | * | Bump release to 2.6.2 | Timothy Crosley | 2014-12-25 | 3 | -5/+5 |
| |/ |/| | |||||
* | | Merge pull request #38 from timothycrosley/feature/fix-issue-31 | Timothy Edmund Crosley | 2014-12-25 | 2 | -4/+1 |
|\ \ | |||||
| * | | Update to use configparser instead of conflict with it | Timothy Crosley | 2014-12-25 | 2 | -4/+1 |
|/ / | |||||
* | | Merge pull request #37 from timothycrosley/feature/fix-issue-36 | Timothy Edmund Crosley | 2014-12-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | Expose StringIO object within module correctly | Timothy Crosley | 2014-12-25 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #29 from acdha/patch-1 | Timothy Edmund Crosley | 2014-03-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix StringIO on Python 3 | Chris Adams | 2014-03-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #27 from timothycrosley/feature/fix-issue-26 | Timothy Edmund Crosley | 2014-03-07 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add travis badge to pies | Timothy Crosley | 2014-03-07 | 1 | -0/+1 |
* | | | Merge pull request #25 from msabramo/travis | Timothy Edmund Crosley | 2014-02-24 | 1 | -1/+10 |
|\ \ \ | |||||
| * | | | .travis.yml: Run py.test, install pies2overrides for py2 | Marc Abramowitz | 2014-02-24 | 1 | -1/+10 |
| |/ / | |||||
* | | | Merge pull request #24 from msabramo/tox_use_local_pies2overrides | Timothy Edmund Crosley | 2014-02-24 | 1 | -0/+11 |
|\ \ \ | |/ / |/| | | |||||
| * | | tox.ini: Install local pies2overrides | Marc Abramowitz | 2014-02-24 | 1 | -0/+11 |
|/ / | |||||
* | | Merge tag '2.6.1' into develop | Timothy Crosley | 2014-02-24 | 4 | -9/+7 |
|\ \ | |/ | |||||
| * | Merge branch 'release/2.6.1'2.6.1 | Timothy Crosley | 2014-02-24 | 9 | -12/+39 |
| |\ | |||||
| | * | Disable wheel support till I determine correct way to change requirements per... | Timothy Crosley | 2014-02-24 | 1 | -2/+0 |