Merge branch 'master' into fix_is_namedtuple_dict_fu

.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}"

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
 

conf.py

@@ -44,7 +44,7 @@
 # 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:

setup.py

@@ -12,7 +12,7 @@
     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:

simplejson/__init__.py

@@ -118,7 +118,7 @@
 
 """
 from __future__ import absolute_import
-__version__ = '3.17.3'
+__version__ = '3.17.4'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',