Updated the changelog and bumped the version number.

git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@378 18f92427-320e-0410-9341-c67f048884a3

6 files changed, 36 insertions, 35 deletions

diff --git a/CHANGES b/CHANGES
index 7593fc3..deec9e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 
 For a complete Subversion changelog, see 'http://pyyaml.org/log/pyyaml'.
 
+3.10 (2011-05-30)
+-----------------
+
+* Do not try to build LibYAML bindings on platforms other than CPython
+  (Thank to olt(at)bogosoft(dot)com).
+* Clear cyclic references in the parser and the emitter
+  (Thank to kristjan(at)ccpgames(dot)com).
 
 3.09 (2009-08-31)
 -----------------
diff --git a/announcement.msg b/announcement.msg
index 2e37c27..8cb814c 100644
--- a/announcement.msg
+++ b/announcement.msg
@@ -1,33 +1,24 @@
-From: Kirill Simonov <xi@gamma.dn.ua>
+From: Kirill Simonov <xi@resolvent.net>
 To: python-list@python.org, python-announce@python.org, yaml-core@lists.sourceforge.net
-Subject: [ANN] PyYAML-3.09: YAML parser and emitter for Python
+Subject: [ANN] PyYAML-3.10: YAML parser and emitter for Python
 
 ========================
- Announcing PyYAML-3.09
+ Announcing PyYAML-3.10
 ========================
 
 A new bug fix release of PyYAML is now available:
 
     http://pyyaml.org/wiki/PyYAML
 
-Note that PyYAML supports both Python 2 and Python 3.  For
-compatibility notes, please see
-
-    http://pyyaml.org/wiki/PyYAMLDocumentation#Python3support
-
 
 Changes
 =======
 
-* Fixed use of uninitialized memory when emitting anchors with
-  LibYAML bindings (Thank to cegner(at)yahoo-inc(dot)com).
-* Fixed emitting incorrect BOM characters for UTF-16 (Thank to
-  Valentin Nechayev)
-* Fixed the emitter for folded scalars not respecting the preferred
-  line width (Thank to Ingy).
-* Fixed a subtle ordering issue with emitting '%TAG' directives
-  (Thank to Andrey Somov).
-* Fixed performance regression with LibYAML bindings.
+* Do not try to build LibYAML bindings on platforms other than CPython;
+  this fixed installation under Jython (Thank to olt(at)bogosoft(dot)com).
+* Clear cyclic references in the parser and the emitter
+  (Thank to kristjan(at)ccpgames(dot)com).
+* LibYAML bindings are rebuilt with the latest version of Cython.
 
 
 Resources
@@ -36,15 +27,16 @@ Resources
 PyYAML homepage: http://pyyaml.org/wiki/PyYAML
 PyYAML documentation: http://pyyaml.org/wiki/PyYAMLDocumentation
 
-TAR.GZ package: http://pyyaml.org/download/pyyaml/PyYAML-3.09.tar.gz
-ZIP package: http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip
+TAR.GZ package: http://pyyaml.org/download/pyyaml/PyYAML-3.10.tar.gz
+ZIP package: http://pyyaml.org/download/pyyaml/PyYAML-3.10.zip
 Windows installers:
-    http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py2.3.exe
-    http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py2.4.exe
-    http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py2.5.exe
-    http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py2.6.exe
-    http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py3.0.exe
-    http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py3.1.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py2.3.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py2.4.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py2.5.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py2.6.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py3.0.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py3.1.exe
+    http://pyyaml.org/download/pyyaml/PyYAML-3.10.win32-py3.2.exe
 
 PyYAML SVN repository: http://svn.pyyaml.org/pyyaml
 Submit a bug report: http://pyyaml.org/newticket?component=pyyaml
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
index d414be8..f977f46 100644
--- a/lib/yaml/__init__.py
+++ b/lib/yaml/__init__.py
@@ -8,7 +8,7 @@ from nodes import *
 from loader import *
 from dumper import *
 
-__version__ = '3.09'
+__version__ = '3.10'
 
 try:
     from cyaml import *
diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py
index 2d49ac8..0033d9c 100644
--- a/lib3/yaml/__init__.py
+++ b/lib3/yaml/__init__.py
@@ -8,7 +8,7 @@ from .nodes import *
 from .loader import *
 from .dumper import *
 
-__version__ = '3.09'
+__version__ = '3.10'
 try:
     from .cyaml import *
     __with_libyaml__ = True
diff --git a/setup.cfg b/setup.cfg
index 932c5e2..0444d87 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,19 +17,19 @@
 
 # The following options are used to build PyYAML Windows installer
 # for Python 2.3 on my PC:
-#include_dirs=../../../libyaml/tags/0.1.3/include
-#library_dirs=../../../libyaml/tags/0.1.3/win32/vc6/output/release/lib
+#include_dirs=../../../libyaml/tags/0.1.4/include
+#library_dirs=../../../libyaml/tags/0.1.4/win32/vc6/output/release/lib
 #define=YAML_DECLARE_STATIC
 
 # The following options are used to build PyYAML Windows installer
 # for Python 2.4 and Python 2.5 on my PC:
-#include_dirs=../../../libyaml/tags/0.1.3/include
-#library_dirs=../../../libyaml/tags/0.1.3/win32/vs2003/output/release/lib
+#include_dirs=../../../libyaml/tags/0.1.4/include
+#library_dirs=../../../libyaml/tags/0.1.4/win32/vs2003/output/release/lib
 #define=YAML_DECLARE_STATIC
 
 # The following options are used to build PyYAML Windows installer
-# for Python 2.6, Python 3.0 and Python 3.1 on my PC:
-#include_dirs=../../../libyaml/tags/0.1.3/include
-#library_dirs=../../../libyaml/tags/0.1.3/win32/vs2008/output/release/lib
+# for Python 2.6, 2.7, 3.0, 3.1 and 3.2 on my PC:
+#include_dirs=../../../libyaml/tags/0.1.4/include
+#library_dirs=../../../libyaml/tags/0.1.4/win32/vs2008/output/release/lib
 #define=YAML_DECLARE_STATIC
 
diff --git a/setup.py b/setup.py
index fbc6795..1bda151 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 
 NAME = 'PyYAML'
-VERSION = '3.09'
+VERSION = '3.10'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
 YAML is a data serialization format designed for human readability
@@ -31,9 +31,11 @@ CLASSIFIERS = [
     "Programming Language :: Python :: 2.4",
     "Programming Language :: Python :: 2.5",
     "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.0",
     "Programming Language :: Python :: 3.1",
+    "Programming Language :: Python :: 3.2",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Text Processing :: Markup",
 ]