summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set manylinux explicitlyexplicit-manylinuxBob Ippolito2021-08-191-0/+3
|
* Explicitly set CIBW_ARCHS_LINUXBob Ippolito2021-08-191-1/+1
|
* Merge pull request #287 from simplejson/upgrade-cibuildwheelv3.17.4Bob Ippolito2021-08-195-4/+9
|\ | | | | Upgrade cibuildwheel to v2.1.1
| * Upgrade cibuildwheel to v2.1.1test-v3.17.4Bob Ippolito2021-08-195-4/+9
|/
* Merge pull request #283 from simplejson/github-actionsv3.17.3Bob Ippolito2021-07-0917-493/+176
|\ | | | | Replace travis and appveyor with github actions
| * Replace travis and appveyor with github actionsBob Ippolito2021-07-0917-493/+176
|/
* Merge pull request #273 from timgates42/bugfix_typo_precedenceBob Ippolito2020-12-291-1/+1
|\ | | | | docs: fix simple typo, precendence -> precedence
| * docs: fix simple typo, precendence -> precedenceTim Gates2020-12-291-1/+1
|/ | | | | | There is a small typo in simplejson/__init__.py. Should read `precedence` rather than `precendence`.
* Merge pull request #271 from cclauss/patch-1Bob Ippolito2020-12-181-0/+3
|\ | | | | Travis CI: Add Python 3.9 to the testing
| * Travis CI: Add Python 3.9 to the testingChristian Clauss2020-12-181-0/+3
|/
* v3.17.2v3.17.2Bob Ippolito2020-07-164-5/+6
|
* Add manylinux wheels back for amd64Bob Ippolito2020-07-161-1/+3
|
* v3.17.1v3.17.1Bob Ippolito2020-07-164-4/+13
|
* Merge pull request #264 from odidev/arm_supportBob Ippolito2020-07-162-1/+12
|\ | | | | Added arm64 support in travis-ci
| * Added arm64 support in travis-ciodidev2020-07-152-1/+12
|/ | | | Signed-off-by: odidev <odidev@puresoftware.com>
* Resolves #261, improve README grammarBob Ippolito2020-04-171-1/+1
|
* Merge pull request #260 from simplejson/pep-0527Bob Ippolito2020-03-143-9/+14
|\ | | | | Per PEP 527 stop building bdist_wininst
| * Update travis matrixpep-0527Bob Ippolito2020-03-141-7/+12
| |
| * Per PEP 527 stop building bdist_wininstBob Ippolito2020-03-142-2/+2
|/
* Set version back to v3.17.0v3.17.0Bob Ippolito2019-11-174-5/+5
|
* Bump version to v3.18.0 to work around build issuesBob Ippolito2019-11-173-4/+4
|
* Rotate API key againBob Ippolito2019-11-171-2/+2
|
* Remove old API keyBob Ippolito2019-11-171-2/+0
|
* Update travis deploy keyBob Ippolito2019-11-171-3/+5
|
* Merge pull request #257 from simplejson/python3-doc-updatesBob Ippolito2019-11-175-340/+261
|\ | | | | Start transitioning docs to be Python 3 centric
| * Finish updating docs to be Python 3-centricBob Ippolito2019-11-174-332/+241
| |
| * Start transitioning docs to be Python 3 centricpython3-doc-updatesBob Ippolito2019-10-223-11/+23
|/
* Merge pull request #256 from simplejson/python-3.8Bob Ippolito2019-10-202-4/+8
|\ | | | | Update build matrix for Python 3.8 on Windows & macOS
| * 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
|\ | | | | Travis CI: Upgrade to Python 3.8
| * 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
|\ | | | | Travis CI: Simplify by upgrading to dist: xenial
| * 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
|/ | | __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-1Bob Ippolito2019-04-171-9/+0
|\ | | | | .travis.yml: The 'sudo' tag is now deprecated in Travis CI
| * .travis.yml: The 'sudo' tag is now deprecated in Travis CIcclauss2019-04-171-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.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 example
| * 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
|\ | | | | Fix a typo in appveyor.yml