Merge branch 'prepare-release-2.4.0'

dateutil · Jan 5, 2015 · 8796174 · 8796174
2 parents c02da78 + e0558da
commit 8796174
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,13 @@
+Version 2.4.0
+-------------
+
+- Fix an issue with relativedelta and freezegun (lp:1374022)
+- Fix tzinfo in windows for timezones without dst (lp:1010050, gh #2)
+- Ignore missing timezones in windows like in POSIX
+- Fix minimal version requirement for six (gh #6)
+- Many rrule changes and fixes by @pganssle (gh pull requests #13 #14 #17),
+    including defusing some infinite loops (gh #4)
+
 Version 2.3
 -----------
 

diff --git a/dateutil/__init__.py b/dateutil/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "2.3"
+__version__ = "2.4.0"
diff --git a/docs/conf.py b/docs/conf.py
@@ -50,16 +50,16 @@
 
 # General information about the project.
 project = 'dateutil'
-copyright = '2014, dateutil'
+copyright = '2015, dateutil'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.3'
+version = '2.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.3'
+release = '2.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.