summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2019-05-28 06:39:39 +0200
committerGeorg Brandl <georg@python.org>2019-05-28 06:39:39 +0200
commitb694159eab5a9206b58f126691cde6a9a61311b3 (patch)
tree847a5a261d21c3994d09214554174aefa242f4ce
parentc6735d522a71c410b21f07a210f2dfd1808c4327 (diff)
downloadpygments-b694159eab5a9206b58f126691cde6a9a61311b3.tar.gz
Update changelog, prepare 2.4.2 release.
-rw-r--r--CHANGES11
-rw-r--r--pygments/__init__.py2
-rwxr-xr-xsetup.py2
3 files changed, 13 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 2ecbb94b..6822bf91 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,14 @@ Issue numbers refer to the tracker at
pull request numbers to the requests at
<https://bitbucket.org/birkenfeld/pygments-main/pull-requests/merged>.
+Version 2.4.2
+-------------
+(released May 28, 2019)
+
+- Fix encoding error when guessing lexer with given ``encoding`` option
+ (#1438)
+
+
Version 2.4.1
-------------
(released May 24, 2019)
@@ -23,6 +31,7 @@ Version 2.4.1
- Fix F# lexer name (PR#709)
- Fix ``TerminalFormatter`` using bold for bright text (#1480)
+
Version 2.4.0
-------------
(released May 8, 2019)
@@ -72,6 +81,7 @@ Version 2.4.0
- TypoScript uses ``.typoscript`` now (#1498)
- Updated Trove classifiers and ``pip`` requirements (PR#799)
+
Version 2.3.1
-------------
(released Dec 16, 2018)
@@ -96,6 +106,7 @@ Version 2.3.1
- Fix invalid string escape sequences
- Fix `FutureWarning` introduced by regex changes in Python 3.7
+
Version 2.3.0
-------------
(released Nov 25, 2018)
diff --git a/pygments/__init__.py b/pygments/__init__.py
index f0043e54..ef9257cc 100644
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -29,7 +29,7 @@ import sys
from pygments.util import StringIO, BytesIO
-__version__ = '2.4.1'
+__version__ = '2.4.2'
__docformat__ = 'restructuredtext'
__all__ = ['lex', 'format', 'highlight']
diff --git a/setup.py b/setup.py
index 98259f53..6257cd74 100755
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ else:
setup(
name = 'Pygments',
- version = '2.4.1',
+ version = '2.4.2',
url = 'http://pygments.org/',
license = 'BSD License',
author = 'Georg Brandl',