diff options
| author | Bob Ippolito <bob@redivi.com> | 2021-08-20 08:22:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 08:22:48 -0700 |
| commit | 2b75ded9dbaf6768c0d74e887ea84b8e9124aa86 (patch) | |
| tree | 50c398c73d1f9e0915edd5ebc75f3ffd5f5826c9 | |
| parent | c901c8cbb5fc67e069011f11fe954908e781470b (diff) | |
| parent | 5a40364f951f85ed73d6aaf881f8ee9521a56f07 (diff) | |
| download | simplejson-2b75ded9dbaf6768c0d74e887ea84b8e9124aa86.tar.gz | |
Merge branch 'master' into fix_is_namedtuple_dict_fu
| -rw-r--r-- | .github/workflows/build-and-deploy.yml | 2 | ||||
| -rw-r--r-- | CHANGES.txt | 8 | ||||
| -rw-r--r-- | conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | simplejson/__init__.py | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index b3cf183..4f4d488 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -32,7 +32,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.0.0a4 + uses: pypa/cibuildwheel@v2.1.1 env: CIBW_TEST_COMMAND: >- python -m simplejson.tests._cibw_runner "{project}" diff --git a/CHANGES.txt b/CHANGES.txt index 54cc2ef..67514d4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,15 @@ +Version 3.17.5 released 2021-08-XX + * Fix the C extension module to harden is_namedtuple against looks-a-likes such as Mocks. Also prevent dict encoding from causing an unraised SystemError when encountering a non-Dict. Noticed by running user tests against a CPython interpreter with C asserts enabled (COPTS += -UNDEBUG). + https://github.com/simplejson/simplejson/pull/284 + +Version 3.17.4 released 2021-08-19 + +* Upgrade cibuildwheel + https://github.com/simplejson/simplejson/pull/287 Version 3.17.3 released 2021-07-09 @@ -44,7 +44,7 @@ copyright = '2021, Bob Ippolito' # The short X.Y version. version = '3.17' # The full version, including alpha/beta/rc tags. -release = '3.17.3' +release = '3.17.4' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -12,7 +12,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.17.3' +VERSION = '3.17.4' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" with open('README.rst', 'r') as f: diff --git a/simplejson/__init__.py b/simplejson/__init__.py index 9e918ff..aecbbaa 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -118,7 +118,7 @@ Serializing multiple objects to JSON lines (newline-delimited JSON):: """ from __future__ import absolute_import -__version__ = '3.17.3' +__version__ = '3.17.4' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', |