summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update build matrix for Python 3.8 on Windowspython-3.8Bob Ippolito2019-10-202-4/+8
* Merge pull request #255 from cclauss/patch-1Bob Ippolito2019-10-201-5/+4
|\
| * Python 3.7.4 on macOSChristian Clauss2019-10-201-1/+1
| * Python 3.7.4 on xcode11.2Christian Clauss2019-10-201-1/+2
| * Travis CI: Upgrade to Python 3.8Christian Clauss2019-10-201-3/+1
|/
* Merge pull request #247 from cclauss/patch-1Bob Ippolito2019-04-171-24/+17
|\
| * Preserve the sort ordercclauss2019-04-171-11/+13
| * pypy and pypy3 NEED Trustycclauss2019-04-171-3/+5
| * Python 2.6 and 3.3 NEED Trustycclauss2019-04-171-2/+4
| * Travis CI: Simplify by upgrading to dist: xenialcclauss2019-04-171-25/+12
|/
* Merge pull request #246 from cclauss/patch-1Bob Ippolito2019-04-171-9/+0
|\
| * .travis.yml: The 'sudo' tag is now deprecated in Travis CIcclauss2019-04-171-9/+0
|/
* require docker and sudo for xenial py3.7Bob Ippolito2018-09-081-1/+3
* Disable BUILD_WHEEL until we know it works, re #181Bob Ippolito2018-09-081-4/+2
* Merge branch 'master' of https://github.com/simplejson/simplejsonBob Ippolito2018-09-081-4/+1
|\
| * Simplify travis configBob Ippolito2018-09-071-4/+1
* | No longer signing releasesBob Ippolito2018-09-071-2/+1
|/
* Add appveyor status iconBob Ippolito2018-09-071-0/+3
* Update CHANGES for v3.16.1v3.16.1Bob Ippolito2018-09-071-1/+2
* Merge pull request #236 from simplejson/json-lines-exampleBob Ippolito2018-09-076-29/+54
|\
| * Prep for v3.16.1 and add JSON lines examplejson-lines-exampleBob Ippolito2018-09-066-29/+54
|/
* Merge pull request #235 from simplejson/felixonmars-patch-1-1Bob Ippolito2018-09-041-1/+1
|\
| * Update appveyor.ymlfelixonmars-patch-1-1Felix Yan2018-09-051-1/+1
|/
* Merge pull request #233 from simplejson/travis-py37Bob Ippolito2018-09-042-2/+12
|\
| * pyenv on osx is not up to date yetBob Ippolito2018-09-041-5/+2
| * Merge branch 'master' into travis-py37Bob Ippolito2018-09-041-5/+13
| |\ | |/ |/|
* | Merge pull request #234 from simplejson/appveyor-py37Bob Ippolito2018-09-041-5/+13
|\ \
| * | Add Python 3.7 to appveyorBob Ippolito2018-09-041-5/+13
|/ /
| * Change pyenv clone URLBob Ippolito2018-09-041-1/+1
| * Use xenial distro for Python 3.7Bob Ippolito2018-09-041-1/+1
| * Add Python 3.7 to TravisBob Ippolito2018-09-041-1/+14
|/
* Merge pull request #231 from ushuz/manylinux1-wheelsBob Ippolito2018-09-033-2/+12
|\
| * Build manylinux1 wheels with cibuildwheel 0.9.4John Hu2018-09-033-2/+12
|/
* Update CHANGES for v3.16.0v3.16.0Bob Ippolito2018-06-284-4/+14
* Merge pull request #225 from benjaminp/empty-strBob Ippolito2018-06-272-7/+10
|\
| * fix indentationBenjamin Peterson2018-06-261-1/+1
| * add testBenjamin Peterson2018-06-261-0/+2
| * On Python 2, decode empty strings as str not unicode.Benjamin Peterson2018-06-261-7/+8
|/
* Merge pull request #224 from hugovk/python_requiresBob Ippolito2018-06-191-2/+5
|\
| * Add python_requires to help pipHugo2018-06-191-0/+3
| * http -> httpsHugo2018-06-191-2/+2
|/
* Merge pull request #222 from simplejson/doc-css-fix-gh-221Bob Ippolito2018-06-041-1/+1
|\
| * Fix #221. Allow Sphinx to set css file namedoc-css-fix-gh-221Bob Ippolito2018-06-041-1/+1
|/
* v3.15.0v3.15.0Bob Ippolito2018-05-124-4/+19
* Merge pull request #220 from simplejson/speedups-cleanupBob Ippolito2018-05-121-141/+105
|\
| * Merge branch 'master' into speedups-cleanupspeedups-cleanupBob Ippolito2018-04-254-15/+76
| |\ | |/ |/|
* | Merge pull request #219 from simplejson/str-decodeBob Ippolito2018-04-254-15/+76
|\ \
| * \ Merge branch 'master' into str-decodestr-decodeBob Ippolito2018-04-252-6/+13
| |\ \ | |/ / |/| |
| * | Fix the other comment typosBob Ippolito2018-04-251-3/+3
| * | fix comment typosBob Ippolito2018-04-251-3/+3