Update version, add *.pyd to gitignore

5 files changed, 8 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 590f60f..80a6720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.egg
 *.pyc
 *.so
+*.pyd
 .DS_Store
 /MANIFEST
 /.coverage
diff --git a/CHANGES.txt b/CHANGES.txt
index 443c5c3..d6edd31 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+Version 3.12.2 released 2017-11-23
+
+* Workarounds for NamedTemporaryFile issues with Windows for tool tests
+
 Version 3.12.1 released 2017-11-23
 
 * Misc updates to build infrastructure
diff --git a/conf.py b/conf.py
index 52a0f51..7cc8864 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2017, Bob Ippolito'
 # The short X.Y version.
 version = '3.12'
 # The full version, including alpha/beta/rc tags.
-release = '3.12.1'
+release = '3.12.2'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 50ee63c..ce68318 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.12.1'
+VERSION = '3.12.2'
 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 3741f1f..32a4875 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
     Expecting property name: line 1 column 3 (char 2)
 """
 from __future__ import absolute_import
-__version__ = '3.12.1'
+__version__ = '3.12.2'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',