From da8eeb5a9a5121e14a792497129b04d6c77ef0ba Mon Sep 17 00:00:00 2001
From: ColinDuquesnoy <colin.duquesnoy@gmail.com>
Date: Sun, 30 Nov 2014 16:16:31 +0100
Subject: [PATCH] Update release infos and bump version to 2.4

---
 CHANGELOG.rst             | 25 +++++++++++++++++++++++++
 README.rst                |  2 +-
 pyqode/python/__init__.py |  2 +-
 setup.py                  | 14 +++-----------
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2bd4c051..474082ca 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,28 @@
+Changelog
+=========
+
+2.4.0
+-----
+
+New features:
+
+- add outline tree view
+- improvements to the syntax highlighter: make use of the new formats types
+- add more examples
+
+Fixed bugs:
+
+- fix default encoding on windows
+- fix lost of selection after unindent
+- fix file path regex for exception traceback highlighting in the python
+  interactive console
+- fix some bugs with pyside
+- fix some bugs with python 2
+- fix some bugs with auto indent mode
+- fix some bugs with auto completes of triple quotes (both single and double
+  quotes)
+
+
 2.3.0
 -----
 
diff --git a/README.rst b/README.rst
index 3fd0831b..981a1968 100644
--- a/README.rst
+++ b/README.rst
@@ -69,7 +69,7 @@ Installation
 
 ::
 
-    $ pip install pyqode.python
+    $ pip install pyqode.python --upgrade
 
 
 Testing
diff --git a/pyqode/python/__init__.py b/pyqode/python/__init__.py
index 70500fcd..968f43a1 100644
--- a/pyqode/python/__init__.py
+++ b/pyqode/python/__init__.py
@@ -6,5 +6,5 @@
 completion, documentation lookups, code linters, and so on...).
 
 """
-__version__ = '2.4.dev'
+__version__ = '2.4.0'
 
diff --git a/setup.py b/setup.py
index 54caba2b..b97a1213 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 This setup script packages pyqode.python
 """
 from setuptools import setup, find_packages
-
+from pyqode.python import __version__
 
 #
 # add ``build_ui command`` (optional, for development only)
@@ -19,15 +19,6 @@
     cmdclass = {}
 
 
-def read_version():
-    with open("pyqode/python/__init__.py") as f:
-        lines = f.read().splitlines()
-        for l in lines:
-            if "__version__" in l:
-                return l.split("=")[1].strip().replace('"', '').replace(
-                    "'", '')
-
-
 def readme():
     return str(open('README.rst').read())
 
@@ -45,7 +36,7 @@ def readme():
 setup(
     name='pyqode.python',
     namespace_packages=['pyqode'],
-    version=read_version(),
+    version=__version__,
     packages=[p for p in find_packages() if 'test' not in p],
     keywords=["CodeEdit PySide PyQt code editor widget python"],
     package_dir={'pyqode': 'pyqode'},
@@ -72,6 +63,7 @@ def readme():
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Widget Sets',
         'Topic :: Text Editors :: Integrated Development Environments (IDE)'