jlec 14/12/21 18:29:37
Added: pandas-0.15.2-zoneinfo.patch
pandas-0.15.1-enconding.patch
Log:
dev-python/pandas: Version Bump; Allow fast testing via FAST_PANDAS=true;
drop dead functions
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1 dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch?rev=1.1&content-type=text/plain
Index: pandas-0.15.2-zoneinfo.patch
===================================================================
pandas/tests/test_series.py | 2 +-
pandas/tseries/tests/test_daterange.py | 2 +-
pandas/tseries/tests/test_period.py | 4 ++--
pandas/tseries/tests/test_timeseries.py | 4 ++--
pandas/tslib.pyx | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pandas/tests/test_series.py b/pandas/tests/test_series.py
index c0daeb7..b930b39 100644
--- a/pandas/tests/test_series.py
+++ b/pandas/tests/test_series.py
@@ -5021,7 +5021,7 @@ 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 dateutil.tz import 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 d568a75..91019ee 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 dateutil.tz import 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 cf82733..1fd2d7b 100644
--- a/pandas/tseries/tests/test_period.py
+++ b/pandas/tseries/tests/test_period.py
@@ -104,12 +104,12 @@ class TestPeriodProperties(tm.TestCase):
import dateutil
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, dateutil.tz.gettz('Europe/Brussels'))
def test_timestamp_tz_arg_dateutil_from_string(self):
import dateutil
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, dateutil.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 9b8200e..7a428fd 100644
--- a/pandas/tseries/tests/test_timeseries.py
+++ b/pandas/tseries/tests/test_timeseries.py
@@ -419,7 +419,7 @@ class TestTimeSeries(tm.TestCase):
tm._skip_if_no_dateutil()
import dateutil
rng = date_range('20090415', '20090519',
- tz=dateutil.zoneinfo.gettz('US/Eastern'))
+ tz=dateutil.tz.gettz('US/Eastern'))
stamp = rng[0]
dtval = stamp.to_pydatetime()
@@ -1797,7 +1797,7 @@ class TestTimeSeries(tm.TestCase):
def test_append_concat_tz_dateutil(self):
# GH 2938
tm._skip_if_no_dateutil()
- from dateutil.zoneinfo import gettz as timezone
+ from dateutil.tz import gettz as timezone
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 e3e18b9..76f5746 100644
--- a/pandas/tslib.pyx
+++ b/pandas/tslib.pyx
@@ -41,7 +41,7 @@ from datetime import time as datetime_time
# dateutil compat
from dateutil.tz import (tzoffset, tzlocal as _dateutil_tzlocal, tzfile as
_dateutil_tzfile,
tzutc as _dateutil_tzutc)
-from dateutil.zoneinfo import gettz as _dateutil_gettz
+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.1 dev-python/pandas/files/pandas-0.15.1-enconding.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.15.1-enconding.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pandas/files/pandas-0.15.1-enconding.patch?rev=1.1&content-type=text/plain
Index: pandas-0.15.1-enconding.patch
===================================================================
>From c4bcc2054bfd2f89b640bea0c9a109b0184d6710 Mon Sep 17 00:00:00 2001
From: Francesc Via <[email protected]>
Date: Sat, 29 Nov 2014 16:44:09 +0000
Subject: [PATCH] BUG: moving the utf encoding line to the first line (before
from __future ..)
---
pandas/tests/test_format.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pandas/tests/test_format.py b/pandas/tests/test_format.py
index 3e85347..ba3daf1 100644
--- a/pandas/tests/test_format.py
+++ b/pandas/tests/test_format.py
@@ -1,5 +1,5 @@
-from __future__ import print_function
# -*- coding: utf-8 -*-
+from __future__ import print_function
import re
from pandas.compat import range, zip, lrange, StringIO, PY3, lzip, u
