[gentoo-commits] gentoo-x86 commit in dev-python/pandas/files: pandas-0.16.1-zoneinfo.patch pandas-9999-zoneinfo.patch
jlec15/08/03 07:07:46 Removed: pandas-0.16.1-zoneinfo.patch pandas--zoneinfo.patch Log: Drop old (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
[gentoo-commits] gentoo-x86 commit in dev-python/pandas/files: pandas-0.16.1-zoneinfo.patch pandas-9999-zoneinfo.patch
jlec15/05/15 11:30:51
Modified: pandas-0.16.1-zoneinfo.patch
pandas--zoneinfo.patch
Log:
Fix python-dateutil compatibility
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key
E9402A79B03529A2!)
Revision ChangesPath
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.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch?r1=1.1r2=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.patch13 May 2015 12:50:55 - 1.1
+++ pandas-0.16.1-zoneinfo.patch15 May 2015 11:30:51 - 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--zoneinfo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas--zoneinfo.patch?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas--zoneinfo.patch?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas--zoneinfo.patch?r1=1.1r2=1.2
Index: pandas--zoneinfo.patch
===
RCS file:
/var/cvsroot/gentoo-x86/dev-python/pandas/files/pandas--zoneinfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pandas--zoneinfo.patch 13 May 2015 08:13:05 - 1.1
+++ pandas--zoneinfo.patch 15 May 2015 11:30:51 - 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
[gentoo-commits] gentoo-x86 commit in dev-python/pandas/files: pandas-0.16.1-zoneinfo.patch
jlec15/05/13 12:50:55
Added:pandas-0.16.1-zoneinfo.patch
Log:
Version Bump
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
E9402A79B03529A2!)
Revision ChangesPath
1.1 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.1view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch?rev=1.1content-type=text/plain
Index: pandas-0.16.1-zoneinfo.patch
===
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
+++ b/pandas/compat/__init__.py
@@ -26,6 +26,7 @@ Python 2.6 compatibility:
Other items:
* OrderedDefaultDict
+* platform checker
# pylint disable=W0611
import functools
@@ -754,3 +755,16 @@ class OrderedDefaultdict(OrderedDict):
def __reduce__(self): # optional, for pickle support
args = self.default_factory if self.default_factory else tuple()
return type(self), args, None, None, list(self.items())
+
+
+# https://github.com/pydata/pandas/pull/9123
+def is_platform_windows():
+return sys.platform == 'win32' or sys.platform == 'cygwin'
+
+
+def is_platform_linux():
+return sys.platform == 'linux2'
+
+
+def is_platform_mac():
+return sys.platform == 'darwin'
diff --git a/pandas/tests/test_series.py b/pandas/tests/test_series.py
index 22f8aee..925cfa8 100644
--- a/pandas/tests/test_series.py
+++ b/pandas/tests/test_series.py
@@ -5398,7 +5398,8 @@ class TestSeries(tm.TestCase, CheckNameIntegration):
def test_getitem_setitem_datetime_tz_dateutil(self):
tm._skip_if_no_dateutil();
from dateutil.tz import tzutc
-from dateutil.zoneinfo import gettz
+from pandas.tslib import _dateutil_gettz as gettz
+
tz = lambda x: tzutc() if x == 'UTC' else gettz(x) # handle special
case for utc in dateutil
from pandas import date_range
diff --git a/pandas/tseries/tests/test_daterange.py
b/pandas/tseries/tests/test_daterange.py
index 841d81c..69b1d84 100644
--- a/pandas/tseries/tests/test_daterange.py
+++ b/pandas/tseries/tests/test_daterange.py
@@ -441,7 +441,7 @@ class TestDateRange(tm.TestCase):
def test_month_range_union_tz_dateutil(self):
_skip_if_windows_python_3()
tm._skip_if_no_dateutil()
-from dateutil.zoneinfo import gettz as timezone
+from pandas.tslib import _dateutil_gettz as timezone
tz = timezone('US/Eastern')
early_start = datetime(2011, 1, 1)
diff --git a/pandas/tseries/tests/test_period.py
b/pandas/tseries/tests/test_period.py
index 70c706f..0218af6 100644
--- a/pandas/tseries/tests/test_period.py
+++ b/pandas/tseries/tests/test_period.py
@@ -101,15 +101,15 @@ class TestPeriodProperties(tm.TestCase):
pytz.timezone('Europe/Brussels').normalize(p).tzinfo)
def test_timestamp_tz_arg_dateutil(self):
-import dateutil
+from pandas.tslib import _dateutil_gettz as gettz
from pandas.tslib import maybe_get_tz
p = Period('1/1/2005',
freq='M').to_timestamp(tz=maybe_get_tz('dateutil/Europe/Brussels'))
-self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
+self.assertEqual(p.tz, gettz('Europe/Brussels'))
def test_timestamp_tz_arg_dateutil_from_string(self):
-import dateutil
+from pandas.tslib import _dateutil_gettz as gettz
p = Period('1/1/2005',
freq='M').to_timestamp(tz='dateutil/Europe/Brussels')
-self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
+self.assertEqual(p.tz, gettz('Europe/Brussels'))
def test_timestamp_nat_tz(self):
t = Period('NaT', freq='M').to_timestamp()
diff --git a/pandas/tseries/tests/test_timeseries.py
b/pandas/tseries/tests/test_timeseries.py
index 0c4961d..6c20b02 100644
--- a/pandas/tseries/tests/test_timeseries.py
+++ b/pandas/tseries/tests/test_timeseries.py
@@ -417,9 +417,9 @@ class TestTimeSeries(tm.TestCase):
def test_timestamp_to_datetime_explicit_dateutil(self):
_skip_if_windows_python_3()
tm._skip_if_no_dateutil()
-import dateutil
+from pandas.tslib import _dateutil_gettz as gettz
rng = date_range('20090415', '20090519',
- tz=dateutil.zoneinfo.gettz('US/Eastern'))
+ tz=gettz('US/Eastern'))
