summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #57 from ofir123/python26-fixesHEADdevelopTimothy Edmund Crosley2016-03-261-7/+12
|\ | | | | Fixed some Python 2.6 and IPython issues.
| * Fixed some Python 2.6 and IPython issues.Ofir1232016-01-111-7/+12
|/
* Merge pull request #53 from AbsoluteMSTR/patch-3Timothy Edmund Crosley2015-09-141-1/+149
|\ | | | | backport collection.ChainMap
| * backport collection.ChainMapAnkur Dedania2015-08-191-1/+149
|/ | | ports https://docs.python.org/3.3/library/collections.html#chainmap-objects
* Merge pull request #51 from AbsoluteMSTR/patch-1Timothy Edmund Crosley2015-08-131-1/+1
|\ | | | | fix lru_cache typo
| * fix lru_cache typoAnkur Dedania2015-08-131-1/+1
|/ | | fix lru_cache typo
* Merge pull request #50 from AbsoluteMSTR/developTimothy Edmund Crosley2015-08-131-51/+163
|\ | | | | modified lru_cache to mimic python 3.3+
| * modified lru_cache to mimic python 3.3+Ankur Dedania2015-08-131-51/+163
|/
* Merge tag '2.6.7' into developTimothy Crosley2015-07-123-5/+5
|\ | | | | | | 2.6.7
| * Merge branch 'release/2.6.7'2.6.7masterTimothy Crosley2015-07-125-27/+9
| |\
| | * Update release to 2.6.7Timothy Crosley2015-07-123-5/+5
| |/ |/|
* | Merge pull request #47 from timothycrosley/feature/fix-issue-43Timothy Edmund Crosley2015-07-122-4/+1
|\ \ | | | | | | Remove _thread module to resolve compatibility issues with other libr…
| * | Remove _thread module to resolve compatibility issues with other librariesTimothy Crosley2015-07-122-4/+1
|/ /
* | Merge pull request #46 from timothycrosley/feature/fix-python-3-compatTimothy Edmund Crosley2015-07-122-17/+2
|\ \ | | | | | | Remove install requirements that are version specific, keep them in e…
| * | Remove install requirements that are version specific, keep them in extra ↵feature/fix-python-3-compatTimothy Crosley2015-07-122-17/+2
| | | | | | | | | | | | requires
* | | Merge pull request #45 from patrickyevsukov/patch-1Timothy Edmund Crosley2015-07-121-1/+1
|\ \ \ | |/ / |/| | Fix Typo
| * | Fix TypoPatrick Yevsukov2015-06-111-1/+1
|/ /
* | Merge tag '2.6.5' into developTimothy Crosley2015-05-074-5/+7
|\ \ | |/ | | | | 2.6.5
| * Merge branch 'release/2.6.5'2.6.5Timothy Crosley2015-05-074-5/+7
| |\
| | * Update distribute command to include wheel generationTimothy Crosley2015-05-071-0/+2
| | |
| | * Bump version to 2.6.5Timothy Crosley2015-05-073-5/+5
| |/ |/|
* | Merge tag '2.6.4' into developTimothy Crosley2015-05-073-5/+5
|\ \ | |/ | | | | 2.6.4
| * 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
|\ \ | | | | | | Add environment markers, suggestion from @dstufft
| * | 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
|\ \ | |/ | | | | 2.6.3
| * 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 reassignments
| * | Keep stdout and stderr reassignmentsTimothy Crosley2014-12-251-0/+4
|/ /
* | Merge tag '2.6.2' into developTimothy Crosley2014-12-253-5/+5
|\ \ | |/ | | | | 2.6.2
| * 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 it
| * | 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 correctly
| * | 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 3
| * | 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 pies
| * | 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 py2
| * | | .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 pies2overrides
| * | tox.ini: Install local pies2overridesMarc Abramowitz2014-02-241-0/+11
|/ /
* | Merge tag '2.6.1' into developTimothy Crosley2014-02-244-9/+7
|\ \ | |/ | | | | 2.6.1
| * 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 ↵Timothy Crosley2014-02-241-2/+0
| | | | | | | | | | | | per python version using it
View Lorry Controller Status