summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* v3.17.6v3.17.6Bob Ippolito2021-11-153-3/+3
* Merge pull request #292 from simplejson/python-3.10Bob Ippolito2021-11-152-2/+8
|\
| * Build source with Python 3.10, update CHANGESBob Ippolito2021-11-152-2/+8
|/
* Merge pull request #291 from hugovk/add-3.10Bob Ippolito2021-11-151-0/+1
|\
| * Declare support for Python 3.10Hugo van Kemenade2021-11-151-0/+1
|/
* Update CHANGES.txtv3.17.5Bob Ippolito2021-08-231-1/+1
* Merge pull request #289 from simplejson/fix_is_namedtuple_dict_fuBob Ippolito2021-08-234-7/+15
|\
| * Update version to 3.17.5Bob Ippolito2021-08-233-3/+3
| * Implement _asdict() check for pure python path as wellBob Ippolito2021-08-231-4/+12
|/
* Merge pull request #284 from gpshead/fix_is_namedtuple_dict_fuBob Ippolito2021-08-233-0/+46
|\
| * Raise TypeError when _asdict() is callable but does not return a dictBob Ippolito2021-08-231-0/+5
| * oops, a missing word made it into the commit.Gregory P. Smith2021-08-231-1/+1
| * Move the PyDict_Check after the _asdict call.Gregory P. Smith [Google LLC]2021-08-202-6/+33
| * Merge branch 'master' into fix_is_namedtuple_dict_fuBob Ippolito2021-08-205-4/+12
| |\ | |/ |/|
* | Merge pull request #287 from simplejson/upgrade-cibuildwheelv3.17.4Bob Ippolito2021-08-195-4/+9
|\ \
| * | Upgrade cibuildwheel to v2.1.1test-v3.17.4Bob Ippolito2021-08-195-4/+9
|/ /
| * Fix the C extension module to harden is_namedtuple.Gregory P. Smith [Google LLC]2021-07-162-0/+11
|/
* Merge pull request #283 from simplejson/github-actionsv3.17.3Bob Ippolito2021-07-0917-493/+176
|\
| * 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 -> precedenceTim Gates2020-12-291-1/+1
|/
* Merge pull request #271 from cclauss/patch-1Bob Ippolito2020-12-181-0/+3
|\
| * 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-ciodidev2020-07-152-1/+12
|/
* Resolves #261, improve README grammarBob Ippolito2020-04-171-1/+1
* Merge pull request #260 from simplejson/pep-0527Bob Ippolito2020-03-143-9/+14
|\
| * 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
|\
| * 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 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