Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update travis matrixpep-0527 | Bob Ippolito | 2020-03-14 | 1 | -7/+12 |
| | |||||
* | Per PEP 527 stop building bdist_wininst | Bob Ippolito | 2020-03-14 | 2 | -2/+2 |
| | |||||
* | Set version back to v3.17.0v3.17.0 | Bob Ippolito | 2019-11-17 | 4 | -5/+5 |
| | |||||
* | Bump version to v3.18.0 to work around build issues | Bob Ippolito | 2019-11-17 | 3 | -4/+4 |
| | |||||
* | Rotate API key again | Bob Ippolito | 2019-11-17 | 1 | -2/+2 |
| | |||||
* | Remove old API key | Bob Ippolito | 2019-11-17 | 1 | -2/+0 |
| | |||||
* | Update travis deploy key | Bob Ippolito | 2019-11-17 | 1 | -3/+5 |
| | |||||
* | Merge pull request #257 from simplejson/python3-doc-updates | Bob Ippolito | 2019-11-17 | 5 | -340/+261 |
|\ | | | | | Start transitioning docs to be Python 3 centric | ||||
| * | Finish updating docs to be Python 3-centric | Bob Ippolito | 2019-11-17 | 4 | -332/+241 |
| | | |||||
| * | Start transitioning docs to be Python 3 centricpython3-doc-updates | Bob Ippolito | 2019-10-22 | 3 | -11/+23 |
|/ | |||||
* | Merge pull request #256 from simplejson/python-3.8 | Bob Ippolito | 2019-10-20 | 2 | -4/+8 |
|\ | | | | | Update build matrix for Python 3.8 on Windows & macOS | ||||
| * | Update build matrix for Python 3.8 on Windowspython-3.8 | Bob Ippolito | 2019-10-20 | 2 | -4/+8 |
|/ | |||||
* | Merge pull request #255 from cclauss/patch-1 | Bob Ippolito | 2019-10-20 | 1 | -5/+4 |
|\ | | | | | Travis CI: Upgrade to Python 3.8 | ||||
| * | Python 3.7.4 on macOS | Christian Clauss | 2019-10-20 | 1 | -1/+1 |
| | | |||||
| * | Python 3.7.4 on xcode11.2 | Christian Clauss | 2019-10-20 | 1 | -1/+2 |
| | | |||||
| * | Travis CI: Upgrade to Python 3.8 | Christian Clauss | 2019-10-20 | 1 | -3/+1 |
|/ | |||||
* | Merge pull request #247 from cclauss/patch-1 | Bob Ippolito | 2019-04-17 | 1 | -24/+17 |
|\ | | | | | Travis CI: Simplify by upgrading to dist: xenial | ||||
| * | Preserve the sort order | cclauss | 2019-04-17 | 1 | -11/+13 |
| | | |||||
| * | pypy and pypy3 NEED Trusty | cclauss | 2019-04-17 | 1 | -3/+5 |
| | | |||||
| * | Python 2.6 and 3.3 NEED Trusty | cclauss | 2019-04-17 | 1 | -2/+4 |
| | | |||||
| * | Travis CI: Simplify by upgrading to dist: xenial | cclauss | 2019-04-17 | 1 | -25/+12 |
|/ | | | __Trusty__ reaches its end-of-life this month https://wiki.ubuntu.com/Releases so we should stop hardcoding it. | ||||
* | Merge pull request #246 from cclauss/patch-1 | Bob Ippolito | 2019-04-17 | 1 | -9/+0 |
|\ | | | | | .travis.yml: The 'sudo' tag is now deprecated in Travis CI | ||||
| * | .travis.yml: The 'sudo' tag is now deprecated in Travis CI | cclauss | 2019-04-17 | 1 | -9/+0 |
|/ | | | | | [Travis are now recommending removing the __sudo__ tag](https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration). "_If you currently specify __sudo: false__ in your __.travis.yml__, we recommend removing that configuration_" | ||||
* | require docker and sudo for xenial py3.7 | Bob Ippolito | 2018-09-08 | 1 | -1/+3 |
| | |||||
* | Disable BUILD_WHEEL until we know it works, re #181 | Bob Ippolito | 2018-09-08 | 1 | -4/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/simplejson/simplejson | Bob Ippolito | 2018-09-08 | 1 | -4/+1 |
|\ | |||||
| * | Simplify travis config | Bob Ippolito | 2018-09-07 | 1 | -4/+1 |
| | | |||||
* | | No longer signing releases | Bob Ippolito | 2018-09-07 | 1 | -2/+1 |
|/ | |||||
* | Add appveyor status icon | Bob Ippolito | 2018-09-07 | 1 | -0/+3 |
| | |||||
* | Update CHANGES for v3.16.1v3.16.1 | Bob Ippolito | 2018-09-07 | 1 | -1/+2 |
| | |||||
* | Merge pull request #236 from simplejson/json-lines-example | Bob Ippolito | 2018-09-07 | 6 | -29/+54 |
|\ | | | | | Prep for v3.16.1 and add JSON lines example | ||||
| * | Prep for v3.16.1 and add JSON lines examplejson-lines-example | Bob Ippolito | 2018-09-06 | 6 | -29/+54 |
|/ | |||||
* | Merge pull request #235 from simplejson/felixonmars-patch-1-1 | Bob Ippolito | 2018-09-04 | 1 | -1/+1 |
|\ | | | | | Fix a typo in appveyor.yml | ||||
| * | Update appveyor.ymlfelixonmars-patch-1-1 | Felix Yan | 2018-09-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #233 from simplejson/travis-py37 | Bob Ippolito | 2018-09-04 | 2 | -2/+12 |
|\ | | | | | Add Python 3.7 to Travis | ||||
| * | pyenv on osx is not up to date yet | Bob Ippolito | 2018-09-04 | 1 | -5/+2 |
| | | |||||
| * | Merge branch 'master' into travis-py37 | Bob Ippolito | 2018-09-04 | 1 | -5/+13 |
| |\ | |/ |/| | |||||
* | | Merge pull request #234 from simplejson/appveyor-py37 | Bob Ippolito | 2018-09-04 | 1 | -5/+13 |
|\ \ | | | | | | | Add Python 3.7 to appveyor | ||||
| * | | Add Python 3.7 to appveyor | Bob Ippolito | 2018-09-04 | 1 | -5/+13 |
|/ / | |||||
| * | Change pyenv clone URL | Bob Ippolito | 2018-09-04 | 1 | -1/+1 |
| | | |||||
| * | Use xenial distro for Python 3.7 | Bob Ippolito | 2018-09-04 | 1 | -1/+1 |
| | | | | | | per https://github.com/travis-ci/travis-ci/issues/9815 | ||||
| * | Add Python 3.7 to Travis | Bob Ippolito | 2018-09-04 | 1 | -1/+14 |
|/ | |||||
* | Merge pull request #231 from ushuz/manylinux1-wheels | Bob Ippolito | 2018-09-03 | 3 | -2/+12 |
|\ | | | | | Build manylinux1 wheels with cibuildwheel 0.9.4 | ||||
| * | Build manylinux1 wheels with cibuildwheel 0.9.4 | John Hu | 2018-09-03 | 3 | -2/+12 |
|/ | |||||
* | Update CHANGES for v3.16.0v3.16.0 | Bob Ippolito | 2018-06-28 | 4 | -4/+14 |
| | |||||
* | Merge pull request #225 from benjaminp/empty-str | Bob Ippolito | 2018-06-27 | 2 | -7/+10 |
|\ | | | | | On Python 2, decode empty strings as str not unicode. | ||||
| * | fix indentation | Benjamin Peterson | 2018-06-26 | 1 | -1/+1 |
| | | |||||
| * | add test | Benjamin Peterson | 2018-06-26 | 1 | -0/+2 |
| | | |||||
| * | On Python 2, decode empty strings as str not unicode. | Benjamin Peterson | 2018-06-26 | 1 | -7/+8 |
|/ | | | | | | | | | | | | | | | | In general on Python 2, simplejson decodes ASCII strings as str, only promoting to unicode when needed: >>> simplejson.loads('["Spaetzle", "SpƤtzle"]') ['Spaetzle', u'Sp\xe4tzle'] Since 83a493db6a8b859ec7b10fa85365dd3fdf144c68, though, simplejson has always decoded empty JSON strings as unicode: >>> simplejson.loads('""') u'' This PR restores the old behavior of decoding empty strings as str. | ||||
* | Merge pull request #224 from hugovk/python_requires | Bob Ippolito | 2018-06-19 | 1 | -2/+5 |
|\ | | | | | Add python_requires to help pip |