diff options
author | Bob Ippolito <bob@redivi.com> | 2011-05-08 12:04:36 -0600 |
---|---|---|
committer | Bob Ippolito <bob@redivi.com> | 2011-05-08 12:04:36 -0600 |
commit | e27ec198ec6d28bd0d211939122523a781414318 (patch) | |
tree | da417b2c383d896cf251a2a5d758cd72ce6547a9 | |
parent | ef460026417ab8cd9d8fae615d4e9b9cc784ccf1 (diff) | |
download | simplejson-e27ec198ec6d28bd0d211939122523a781414318.tar.gz |
Move docs to http://simplejson.readthedocs.org/ and update version to 2.1.7
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CHANGES.txt | 5 | ||||
-rw-r--r-- | README.rst | 2 | ||||
-rw-r--r-- | conf.py | 2 | ||||
m--------- | docs | 6 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | simplejson/__init__.py | 2 |
8 files changed, 10 insertions, 13 deletions
@@ -4,3 +4,4 @@ *.so /build /dist +/docs diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index a5be42e..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "docs"] - path = docs - url = git@github.com:simplejson/simplejson.git diff --git a/CHANGES.txt b/CHANGES.txt index d603743..03d86ec 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 2.1.7 released 2011-XX-XX + +* Moved documentation from a git submodule to + http://simplejson.readthedocs.org/ + Version 2.1.6 released 2011-05-08 * Prevent segfaults with deeply nested JSON documents @@ -4,7 +4,7 @@ pure Python code with no dependencies, but includes an optional C extension for a serious speed boost. The latest documentation for simplejson can be read online here: -http://simplejson.github.com/simplejson/ +http://simplejson.readthedocs.org/ simplejson is the externally maintained development version of the json library included with Python 2.6 and Python 3.0, but maintains @@ -44,7 +44,7 @@ copyright = '2011, Bob Ippolito' # The short X.Y version. version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.1.6' +release = '2.1.7' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/docs b/docs deleted file mode 160000 -Subproject b21190d234a8826b949a673e20d323224b2e4eb @@ -13,7 +13,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '2.1.6' +VERSION = '2.1.7' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" LONG_DESCRIPTION = open('README.rst', 'r').read() diff --git a/simplejson/__init__.py b/simplejson/__init__.py index 210b957..dd55861 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print:: $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 2 (char 2) """ -__version__ = '2.1.6' +__version__ = '2.1.7' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', |