summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remofe remnants of Python 2.4 support.no-py2.4Serhiy Storchaka2017-05-083-35/+2
* Merge pull request #153 from hugovk/patch-1Bob Ippolito2017-01-171-0/+2
|\
| * Update Python versionsHugo2017-01-171-0/+2
|/
* Merge pull request #152 from hugovk/patch-1Bob Ippolito2017-01-161-0/+3
|\
| * Python 3.6 is outHugo2017-01-161-0/+3
|/
* v3.10.0v3.10.0Bob Ippolito2016-10-281-1/+1
* Merge branch 'lamflam-raw_json'Bob Ippolito2016-10-288-5/+94
|\
| * Bump version, update changelog, fix issues identified in code review of #143Bob Ippolito2016-10-287-5/+32
| * Merge branch 'raw_json' of https://github.com/lamflam/simplejson into lamflam...Bob Ippolito2016-10-284-1/+63
| |\ |/ /
| * Add support for preprocessed JSON strings (with optimizations) in encoderKevin LaFlamme2016-09-014-1/+63
* | use correct pyenv in runBob Ippolito2016-10-231-1/+2
* | rehash before and after evalBob Ippolito2016-10-231-0/+1
* | Only upload exe and whl filesBob Ippolito2016-10-221-1/+1
* | add signing and uploading artifacts to the scriptBob Ippolito2016-10-211-0/+33
* | remove unnecessary URLBob Ippolito2016-10-211-1/+0
* | v3.9.0v3.9.0Bob Ippolito2016-10-211-1/+1
* | Bump version to 3.9.0Bob Ippolito2016-10-214-6/+6
* | Fixes #144. Workaround for bad behavior in string subclasses.Bob Ippolito2016-10-214-1/+28
* | Update Python versions used for Mac buildsBob Ippolito2016-10-211-2/+2
* | Another attempt to fix Travis Mac buildBob Ippolito2016-10-211-4/+7
* | Update CHANGES.txtBob Ippolito2016-10-211-0/+9
* | Merge pull request #146 from rowillia/masterBob Ippolito2016-09-262-13/+11
|\ \
| * | Remove fromhex all togetherRoy Williams2016-09-222-17/+11
| * | Add support for Python 2.5Roy Williams2016-09-221-2/+6
| * | Use binascii instead of codecsRoy Williams2016-09-221-4/+3
| * | Use `codecs.decode` in Python 2 as opposed to `str.decode` in Python 2.Roy Williams2016-09-211-2/+3
| |/
* | See if we can get those OS X builds workingBob Ippolito2016-09-251-0/+2
|/
* Merge pull request #137 from adamchainz/readthedocs.ioBob Ippolito2016-05-302-2/+2
|\
| * Convert readthedocs link for their .org -> .io migration for hosted projectsAdam Chainz2016-05-292-2/+2
|/
* Merge pull request #134 from compwron/rst_readme_build_statusBob Ippolito2016-03-121-0/+7
|\
| * Readme badge and py2 linklgoldstein2016-03-091-0/+7
|/
* fix artifacts scriptBob Ippolito2016-02-151-2/+2
* v3.8.2 - fix compiler warning, automated wheel builds for Windows and Macv3.8.2wheelsBob Ippolito2016-02-159-14/+139
* Merge pull request #130 from aebrahim/appveyorBob Ippolito2015-11-223-0/+232
|\
| * build windows wheels on appveyorAli Ebrahim2015-11-223-0/+232
|/
* Add Python 3.5 to Travis test suiteBob Ippolito2015-10-271-0/+1
* Fix issue with iterable_as_array and indent option, closes #128v3.8.1Bob Ippolito2015-10-274-22/+29
* Update version to 3.8.1Bob Ippolito2015-09-044-4/+9
* Merge pull request #123 from costypetrisor/fix-int_as_string_bitcount-from-sp...Bob Ippolito2015-09-041-1/+0
|\
| * removed from _speedups.c forgotten "iterable_as_array" without comma after s...Costy Petrisor2015-09-031-1/+0
|/
* clean up iterable_as_array for 3.8.0v3.8.0Bob Ippolito2015-07-186-12/+13
* Merge branch 'master' into iterable_as_array-gh1Nick Babcock2015-07-1043-1112/+3742
|\
| * fix typo in e18cc09v3.7.3Bob Ippolito2015-05-315-4/+9
| * attempt to work around an issue with reloading the Decimal modulev3.7.2Bob Ippolito2015-05-225-8/+16
| * bump version for #119v3.7.1Bob Ippolito2015-05-184-3/+8
| * Merge pull request #119 from cgohlke/patch-1Bob Ippolito2015-05-181-2/+4
| |\
| | * Fix msvc error C2275: 'PyObject' : illegal use of this type as an expressionChristoph Gohlke2015-05-181-2/+4
| |/
| * no longer trust custom repr for int/long/float subclasses #118v3.7.0Bob Ippolito2015-05-188-8/+101
| * Merge pull request #116 from d0ugal/patch-1Bob Ippolito2015-02-181-1/+1
| |\
| | * Fixed a typo in the docsDougal Matthews2015-02-181-1/+1
| |/
View Lorry Controller Status