summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2019-01-02 18:23:24 +0100
committerStefan Behnel <stefan_ml@behnel.de>2019-01-02 18:23:24 +0100
commitc7bdc8c0e32e48c6730332e6b629ccb351c0f91b (patch)
tree298bd1ab976bb350ecb8a84124a9cd9dd7500467
parentb767e9c398bcf0a0f1d5db7e291b5363547b2f0b (diff)
parent1dd26eb772abd58ae3aea596800ed0cd612cf145 (diff)
downloadpython-lxml-c7bdc8c0e32e48c6730332e6b629ccb351c0f91b.tar.gz
Merge lxml-4.2 branch into master.
-rw-r--r--CHANGES.txt7
-rw-r--r--doc/main.txt10
2 files changed, 11 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 02fdef51..959f4a38 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,8 +2,7 @@
lxml changelog
==============
-4.3.0 (2018-??-??)
-==================
+4.3.0 (2019-??-??)
Features added
--------------
@@ -32,12 +31,14 @@ Other changes
which were released in 2014 and 2012 respectively.
-4.2.6 (2018-??-??)
+4.2.6 (2019-01-02)
==================
Bugs fixed
----------
+* LP#1799755: Fix a DeprecationWarning in Py3.7+.
+
* Import warnings in Python 3.6+ were resolved.
diff --git a/doc/main.txt b/doc/main.txt
index c51a03e7..6ac9312f 100644
--- a/doc/main.txt
+++ b/doc/main.txt
@@ -157,8 +157,8 @@ Index <http://pypi.python.org/pypi/lxml/>`_ (PyPI). It has the source
that compiles on various platforms. The source distribution is signed
with `this key <pubkey.asc>`_.
-The latest version is `lxml 4.2.5`_, released 2018-09-09
-(`changes for 4.2.5`_). `Older versions <#old-versions>`_
+The latest version is `lxml 4.2.6`_, released 2019-01-03
+(`changes for 4.2.6`_). `Older versions <#old-versions>`_
are listed below.
Please take a look at the
@@ -250,7 +250,9 @@ See the websites of lxml
..
and the `latest in-development version <http://lxml.de/dev/>`_.
-.. _`PDF documentation`: lxmldoc-4.2.5.pdf
+.. _`PDF documentation`: lxmldoc-4.2.6.pdf
+
+* `lxml 4.2.6`_, released 2019-01-03 (`changes for 4.2.6`_)
* `lxml 4.2.5`_, released 2018-09-09 (`changes for 4.2.5`_)
@@ -274,6 +276,7 @@ See the websites of lxml
* `older releases <http://lxml.de/3.7/#old-versions>`_
+.. _`lxml 4.2.6`: /files/lxml-4.2.6.tgz
.. _`lxml 4.2.5`: /files/lxml-4.2.5.tgz
.. _`lxml 4.2.4`: /files/lxml-4.2.4.tgz
.. _`lxml 4.2.3`: /files/lxml-4.2.3.tgz
@@ -285,6 +288,7 @@ See the websites of lxml
.. _`lxml 4.0.0`: /files/lxml-4.0.0.tgz
.. _`lxml 3.8.0`: /files/lxml-3.8.0.tgz
+.. _`changes for 4.2.6`: /changes-4.2.6.html
.. _`changes for 4.2.5`: /changes-4.2.5.html
.. _`changes for 4.2.4`: /changes-4.2.4.html
.. _`changes for 4.2.3`: /changes-4.2.3.html