Merge branch 'el6' into f21

This commit is contained in:
Jakub Jedelsky 2015-07-03 14:40:55 +02:00
commit 0b63427b1e
2 changed files with 4 additions and 8 deletions

View file

@ -1,5 +1,5 @@
diff --git a/vertica_python/vertica/column.py b/vertica_python/vertica/column.py
index 75d87a2..9eeef08 100644
index cc0bb27..3266d74 100644
--- a/vertica_python/vertica/column.py
+++ b/vertica_python/vertica/column.py
@@ -5,6 +5,11 @@ from collections import namedtuple
@ -8,9 +8,8 @@ index 75d87a2..9eeef08 100644
from datetime import datetime
+from pkg_resources import require,VersionConflict
+try:
+ require("python_dateutil>=1.5")
+ require("python_dateutil>=1.5")
+except VersionConflict:
+ pass
+ pass
from dateutil import parser
import pytz
from vertica_python import errors

View file

@ -84,9 +84,6 @@ vertica-python is a native Python adapter for the Vertica
* Fri Jun 13 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.3-1
- update to new version
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Apr 24 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.1-1
- new version update