Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set manylinux explicitlyexplicit-manylinux | Bob Ippolito | 2021-08-19 | 1 | -0/+3 |
| | |||||
* | Explicitly set CIBW_ARCHS_LINUX | Bob Ippolito | 2021-08-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #287 from simplejson/upgrade-cibuildwheelv3.17.4 | Bob Ippolito | 2021-08-19 | 5 | -4/+9 |
|\ | | | | | Upgrade cibuildwheel to v2.1.1 | ||||
| * | Upgrade cibuildwheel to v2.1.1test-v3.17.4 | Bob Ippolito | 2021-08-19 | 5 | -4/+9 |
|/ | |||||
* | Merge pull request #283 from simplejson/github-actionsv3.17.3 | Bob Ippolito | 2021-07-09 | 17 | -493/+176 |
|\ | | | | | Replace travis and appveyor with github actions | ||||
| * | Replace travis and appveyor with github actions | Bob Ippolito | 2021-07-09 | 17 | -493/+176 |
|/ | |||||
* | Merge pull request #273 from timgates42/bugfix_typo_precedence | Bob Ippolito | 2020-12-29 | 1 | -1/+1 |
|\ | | | | | docs: fix simple typo, precendence -> precedence | ||||
| * | docs: fix simple typo, precendence -> precedence | Tim Gates | 2020-12-29 | 1 | -1/+1 |
|/ | | | | | | There is a small typo in simplejson/__init__.py. Should read `precedence` rather than `precendence`. | ||||
* | Merge pull request #271 from cclauss/patch-1 | Bob Ippolito | 2020-12-18 | 1 | -0/+3 |
|\ | | | | | Travis CI: Add Python 3.9 to the testing | ||||
| * | Travis CI: Add Python 3.9 to the testing | Christian Clauss | 2020-12-18 | 1 | -0/+3 |
|/ | |||||
* | v3.17.2v3.17.2 | Bob Ippolito | 2020-07-16 | 4 | -5/+6 |
| | |||||
* | Add manylinux wheels back for amd64 | Bob Ippolito | 2020-07-16 | 1 | -1/+3 |
| | |||||
* | v3.17.1v3.17.1 | Bob Ippolito | 2020-07-16 | 4 | -4/+13 |
| | |||||
* | Merge pull request #264 from odidev/arm_support | Bob Ippolito | 2020-07-16 | 2 | -1/+12 |
|\ | | | | | Added arm64 support in travis-ci | ||||
| * | Added arm64 support in travis-ci | odidev | 2020-07-15 | 2 | -1/+12 |
|/ | | | | Signed-off-by: odidev <odidev@puresoftware.com> | ||||
* | Resolves #261, improve README grammar | Bob Ippolito | 2020-04-17 | 1 | -1/+1 |
| | |||||
* | Merge pull request #260 from simplejson/pep-0527 | Bob Ippolito | 2020-03-14 | 3 | -9/+14 |
|\ | | | | | Per PEP 527 stop building bdist_wininst | ||||
| * | 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 |