summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2022-11-16 13:18:24 -0800
committerGitHub <noreply@github.com>2022-11-16 13:18:24 -0800
commit4a22505df8b2e3e19268606ca4e662cfd3fc458a (patch)
tree2b2f50e7891947ab9267acb6e3fc220fac9a6f91
parentedde4ef7dfb79284e07844f996262e61920b4f66 (diff)
parentf7f03624aad489eaa852e1de9c24194a752fb2ab (diff)
downloadsimplejson-4a22505df8b2e3e19268606ca4e662cfd3fc458a.tar.gz
Merge pull request #304 from simplejson/version-bump
Update version to v3.18.1 and update CHANGES for #303
-rw-r--r--CHANGES.txt5
-rw-r--r--conf.py4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 7d574e2..221999f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.18.1 released 2022-XX-XX
+
+* Remove unnecessary `i` variable from encoder module namespace
+ https://github.com/simplejson/simplejson/pull/303
+
Version 3.18.0 released 2022-11-14
* Allow serialization of classes that implement for_json or _asdict by
diff --git a/conf.py b/conf.py
index 694446c..e58b507 100644
--- a/conf.py
+++ b/conf.py
@@ -36,7 +36,7 @@ master_doc = 'index'
# General substitutions.
project = 'simplejson'
-copyright = '2021, Bob Ippolito'
+copyright = '2022, Bob Ippolito'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
@@ -44,7 +44,7 @@ copyright = '2021, Bob Ippolito'
# The short X.Y version.
version = '3.18'
# The full version, including alpha/beta/rc tags.
-release = '3.18.0'
+release = '3.18.1'
# 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 336f443..64c5c74 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.18.0'
+VERSION = '3.18.1'
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 c79ad1b..b3e8a81 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.18.0'
+__version__ = '3.18.1'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',