merge 3.0 branch into master

lxml · Dec 14, 2012 · c5f2782 · c5f2782
2 parents 1ad1763 + a5525af
commit c5f2782
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -32,6 +32,21 @@ Other changes
   many children.  Patch by Anders Hammarquist.
 
 
+3.0.2 (2012-12-14)
+==================
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+* Fix crash during interpreter shutdown by switching to Cython 0.17.3 for building.
+
+Other changes
+-------------
+
+
 3.0.1 (2012-10-14)
 ==================
 

diff --git a/doc/build.txt b/doc/build.txt
@@ -42,9 +42,9 @@ developer sources (e.g. to test a bug fix that has not been release
 yet) or if you want to be an lxml developer, then you do need a
 working Cython installation.  You can use pip_ to install it::
 
-    pip install "Cython>=0.17.1"
+    pip install "Cython>=0.17.3"
 
-lxml currently requires Cython 0.17.1, later release versions should
+lxml currently requires Cython 0.17.3, later release versions should
 work as well.
 
 

diff --git a/doc/main.txt b/doc/main.txt
@@ -158,8 +158,8 @@ that compiles on various platforms.  The source distribution is signed
 with `this key <pubkey.asc>`_.  Binary builds are not available from
 PyPI due to the increased maintenance overhead.
 
-The latest version is `lxml 3.0.1`_, released 2012-10-14
-(`changes for 3.0.1`_).  `Older versions <#old-versions>`_
+The latest version is `lxml 3.0.2`_, released 2012-12-14
+(`changes for 3.0.2`_).  `Older versions <#old-versions>`_
 are listed below.
 
 Please take a look at the
@@ -234,7 +234,9 @@ See the web sites of lxml
 `2.3 <http://lxml.de/2.3/>`_
 and the `latest in-development version <http://lxml.de/dev/>`_.
 
-.. _`PDF documentation`: lxmldoc-3.0.1.pdf
+.. _`PDF documentation`: lxmldoc-3.0.2.pdf
+
+* `lxml 3.0.1`_, released 2012-10-14 (`changes for 3.0.1`_)
 
 * `lxml 3.0`_, released 2012-10-08 (`changes for 3.0`_)
 
@@ -258,6 +260,7 @@ and the `latest in-development version <http://lxml.de/dev/>`_.
 
 * `older releases <http://lxml.de/2.3/#old-versions>`_
 
+.. _`lxml 3.0.2`: /files/lxml-3.0.2.tgz
 .. _`lxml 3.0.1`: /files/lxml-3.0.1.tgz
 .. _`lxml 3.0`: /files/lxml-3.0.tgz
 .. _`lxml 3.0beta1`: /files/lxml-3.0beta1.tgz
@@ -271,6 +274,7 @@ and the `latest in-development version <http://lxml.de/dev/>`_.
 .. _`lxml 2.3.1`: /files/lxml-2.3.1.tgz
 .. _`lxml 2.3`: /files/lxml-2.3.tgz
 
+.. _`changes for 3.0.2`: /changes-3.0.2.html
 .. _`changes for 3.0.1`: /changes-3.0.1.html
 .. _`changes for 3.0`: /changes-3.0.html
 .. _`changes for 3.0beta1`: /changes-3.0beta1.html

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.0.1
+3.0.2