* [gentoo-commits] gentoo-x86 commit in dev-python/pandas/files: pandas-0.16.1-zoneinfo.patch pandas-9999-zoneinfo.patch
@ 2015-05-15 11:30 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2015-05-15 11:30 UTC (permalink / raw
To: gentoo-commits
jlec 15/05/15 11:30:51
Modified: pandas-0.16.1-zoneinfo.patch
pandas-9999-zoneinfo.patch
Log:
Fix python-dateutil compatibility
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path
1.2 dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch?r1=1.1&r2=1.2
Index: pandas-0.16.1-zoneinfo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pandas-0.16.1-zoneinfo.patch 13 May 2015 12:50:55 -0000 1.1
+++ pandas-0.16.1-zoneinfo.patch 15 May 2015 11:30:51 -0000 1.2
@@ -112,7 +112,7 @@
rng = date_range('5/8/2012 1:45', periods=10, freq='5T',
tz='dateutil/US/Eastern')
diff --git a/pandas/tslib.pyx b/pandas/tslib.pyx
-index 40dbbd7..4feeaec 100644
+index 40dbbd7..de507c2 100644
--- a/pandas/tslib.pyx
+++ b/pandas/tslib.pyx
@@ -41,7 +41,11 @@ from datetime import time as datetime_time
@@ -122,9 +122,9 @@
-from dateutil.zoneinfo import gettz as _dateutil_gettz
+from pandas.compat import is_platform_windows
+if is_platform_windows():
-+ from dateutil.tz import gettz as _dateutil_gettz
-+else:
+ from dateutil.zoneinfo import gettz as _dateutil_gettz
++else:
++ from dateutil.tz import gettz as _dateutil_gettz
from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
from pandas.compat import parse_date, string_types, PY3, iteritems
1.2 dev-python/pandas/files/pandas-9999-zoneinfo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-9999-zoneinfo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-9999-zoneinfo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-9999-zoneinfo.patch?r1=1.1&r2=1.2
Index: pandas-9999-zoneinfo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pandas/files/pandas-9999-zoneinfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pandas-9999-zoneinfo.patch 13 May 2015 08:13:05 -0000 1.1
+++ pandas-9999-zoneinfo.patch 15 May 2015 11:30:51 -0000 1.2
@@ -1,11 +1,3 @@
- pandas/compat/__init__.py | 14 ++++++++++++++
- pandas/tests/test_series.py | 3 ++-
- pandas/tseries/tests/test_daterange.py | 2 +-
- pandas/tseries/tests/test_period.py | 8 ++++----
- pandas/tseries/tests/test_timeseries.py | 6 +++---
- pandas/tslib.pyx | 6 +++++-
- 6 files changed, 29 insertions(+), 10 deletions(-)
-
diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
index 6be0fac..2a27362 100644
--- a/pandas/compat/__init__.py
@@ -112,7 +104,7 @@
rng = date_range('5/8/2012 1:45', periods=10, freq='5T',
tz='dateutil/US/Eastern')
diff --git a/pandas/tslib.pyx b/pandas/tslib.pyx
-index 66f14bf..a0d4ee0 100644
+index 66f14bf..2b45718 100644
--- a/pandas/tslib.pyx
+++ b/pandas/tslib.pyx
@@ -41,7 +41,11 @@ from datetime import time as datetime_time
@@ -122,9 +114,9 @@
-from dateutil.zoneinfo import gettz as _dateutil_gettz
+from pandas.compat import is_platform_windows
+if is_platform_windows():
-+ from dateutil.tz import gettz as _dateutil_gettz
-+else:
+ from dateutil.zoneinfo import gettz as _dateutil_gettz
++else:
++ from dateutil.tz import gettz as _dateutil_gettz
from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
from pandas.compat import parse_date, string_types, PY3, iteritems
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/pandas/files: pandas-0.16.1-zoneinfo.patch pandas-9999-zoneinfo.patch
@ 2015-08-03 7:07 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2015-08-03 7:07 UTC (permalink / raw
To: gentoo-commits
jlec 15/08/03 07:07:46
Removed: pandas-0.16.1-zoneinfo.patch
pandas-9999-zoneinfo.patch
Log:
Drop old
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-03 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-15 11:30 [gentoo-commits] gentoo-x86 commit in dev-python/pandas/files: pandas-0.16.1-zoneinfo.patch pandas-9999-zoneinfo.patch Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2015-08-03 7:07 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox