[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: python-pandas: Update to 0.18.1.
|
From: |
Efraim Flashner |
|
Subject: |
01/01: gnu: python-pandas: Update to 0.18.1. |
|
Date: |
Mon, 16 May 2016 14:39:59 +0000 (UTC) |
efraim pushed a commit to branch master
in repository guix.
commit 7d0c3c8d018a4aff4ce42f863ce81242555ab119
Author: Efraim Flashner <address@hidden>
Date: Mon May 16 17:36:58 2016 +0300
gnu: python-pandas: Update to 0.18.1.
* gnu/packages/python.scm (python-pandas): Update to 0.18.1.
[native-inputs]: Remove python-setuptools.
[properties]: Define python2-pandas.
(python2-pandas)[native-inputs]: Add python2-setuptools.
* gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../python-pandas-fix-tslib-test-failure.patch | 141 --------------------
gnu/packages/python.scm | 28 ++--
3 files changed, 14 insertions(+), 156 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f366be4..f64adeb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -705,7 +705,6 @@ dist_patch_DATA =
\
gnu/packages/patches/python-paste-remove-website-test.patch \
gnu/packages/patches/python-paste-remove-timing-test.patch \
gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
- gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch \
gnu/packages/patches/qt4-ldflags.patch \
gnu/packages/patches/ratpoison-shell.patch \
gnu/packages/patches/readline-link-ncurses.patch \
diff --git a/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
b/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
deleted file mode 100644
index 62d6a38..0000000
--- a/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-This patch is required to fix a test failure when python-dateutil version
-2.5.2 or later is used. It is derived from the following commits:
-
-80ef4e06526b9b60cf24268454c9456585a790a3
-845ff974af6f7c3b3067cce8a7149b771c2be87
-
-diff --git a/pandas/tseries/tests/test_tslib.py
b/pandas/tseries/tests/test_tslib.py
-index f0d5bf7..863bc6f 100644
---- a/pandas/tseries/tests/test_tslib.py
-+++ b/pandas/tseries/tests/test_tslib.py
-@@ -474,6 +474,11 @@ def test_does_not_convert_mixed_integer(self):
- good_date_string))
-
- def test_parsers(self):
-+
-+ # https://github.com/dateutil/dateutil/issues/217
-+ import dateutil
-+ yearfirst = dateutil.__version__ >= LooseVersion('2.5.0')
-+
- cases = {'2011-01-01': datetime.datetime(2011, 1, 1),
- '2Q2005': datetime.datetime(2005, 4, 1),
- '2Q05': datetime.datetime(2005, 4, 1),
-@@ -527,20 +532,26 @@ def test_parsers(self):
- }
-
- for date_str, expected in compat.iteritems(cases):
-- result1, _, _ = tools.parse_time_string(date_str)
-- result2 = to_datetime(date_str)
-- result3 = to_datetime([date_str])
-- result4 = to_datetime(np.array([date_str], dtype=object))
-- result5 = Timestamp(date_str)
-- result6 = DatetimeIndex([date_str])[0]
-- result7 = date_range(date_str, freq='S', periods=1)
-+ result1, _, _ = tools.parse_time_string(date_str,
-+ yearfirst=yearfirst)
-+ result2 = to_datetime(date_str, yearfirst=yearfirst)
-+ result3 = to_datetime([date_str], yearfirst=yearfirst)
-+ result4 = to_datetime(np.array([date_str], dtype=object),
-+ yearfirst=yearfirst)
-+ result6 = DatetimeIndex([date_str], yearfirst=yearfirst)[0]
- self.assertEqual(result1, expected)
- self.assertEqual(result2, expected)
- self.assertEqual(result3, expected)
- self.assertEqual(result4, expected)
-- self.assertEqual(result5, expected)
- self.assertEqual(result6, expected)
-- self.assertEqual(result7, expected)
-+
-+ # these really need to have yearfist, but we don't support
-+ if not yearfirst:
-+ result5 = Timestamp(date_str)
-+ self.assertEqual(result5, expected)
-+ result7 = date_range(date_str, freq='S', periods=1,
-+ yearfirst=yearfirst)
-+ self.assertEqual(result7, expected)
-
- # NaT
- result1, _, _ = tools.parse_time_string('NaT')
-@@ -589,23 +589,62 @@ def test_parsers_quarter_invalid(self):
- self.assertRaises(ValueError, tools.parse_time_string, case)
-
- def test_parsers_dayfirst_yearfirst(self):
-+
-+ # https://github.com/dateutil/dateutil/issues/217
-+ # this issue was closed
-+ import dateutil
-+ is_compat_version = dateutil.__version__ >= LooseVersion('2.5.2')
-+ if is_compat_version:
-+ dayfirst_yearfirst1 = datetime.datetime(2010, 12, 11)
-+ dayfirst_yearfirst2 = datetime.datetime(2020, 12, 21)
-+ else:
-+ dayfirst_yearfirst1 = datetime.datetime(2010, 11, 12)
-+ dayfirst_yearfirst2 = datetime.datetime(2020, 12, 21)
-+
- # str : dayfirst, yearfirst, expected
-- cases = {'10-11-12': [(False, False, datetime.datetime(2012, 10, 11)),
-- (True, False, datetime.datetime(2012, 11, 10)),
-- (False, True, datetime.datetime(2010, 11, 12)),
-- (True, True, datetime.datetime(2010, 11, 12))],
-- '20/12/21': [(False, False, datetime.datetime(2021, 12, 20)),
-- (True, False, datetime.datetime(2021, 12, 20)),
-- (False, True, datetime.datetime(2020, 12, 21)),
-- (True, True, datetime.datetime(2020, 12, 21))]}
-+ cases = {'10-11-12': [(False, False, False,
-+ datetime.datetime(2012, 10, 11)),
-+ (True, False, False,
-+ datetime.datetime(2012, 11, 10)),
-+ (False, True, False,
-+ datetime.datetime(2010, 11, 12)),
-+ (True, True, False, dayfirst_yearfirst1)],
-+ '20/12/21': [(False, False, False,
-+ datetime.datetime(2021, 12, 20)),
-+ (True, False, False,
-+ datetime.datetime(2021, 12, 20)),
-+ (False, True, False,
-+ datetime.datetime(2020, 12, 21)),
-+ (True, True, True, dayfirst_yearfirst2)]}
-
- tm._skip_if_no_dateutil()
- from dateutil.parser import parse
- for date_str, values in compat.iteritems(cases):
-- for dayfirst, yearfirst, expected in values:
-- result1, _, _ = tools.parse_time_string(date_str,
-- dayfirst=dayfirst,
-- yearfirst=yearfirst)
-+ for dayfirst, yearfirst, is_compat, expected in values:
-+
-+ f = lambda x: tools.parse_time_string(x,
-+ dayfirst=dayfirst,
-+ yearfirst=yearfirst)
-+
-+ # we now have an invalid parse
-+ if is_compat and is_compat_version:
-+ self.assertRaises(tslib.DateParseError, f, date_str)
-+
-+ def f(date_str):
-+ return to_datetime(date_str, dayfirst=dayfirst,
-+ yearfirst=yearfirst)
-+
-+ self.assertRaises(ValueError, f, date_str)
-+
-+ def f(date_str):
-+ return DatetimeIndex([date_str], dayfirst=dayfirst,
-+ yearfirst=yearfirst)[0]
-+
-+ self.assertRaises(ValueError, f, date_str)
-+
-+ continue
-+
-+ result1, _, _ = f(date_str)
-
- result2 = to_datetime(date_str, dayfirst=dayfirst,
- yearfirst=yearfirst)
-@@ -614,7 +653,6 @@ def test_parsers_dayfirst_yearfirst(self):
- yearfirst=yearfirst)[0]
-
- # Timestamp doesn't support dayfirst and yearfirst
--
- self.assertEqual(result1, expected)
- self.assertEqual(result2, expected)
- self.assertEqual(result3, expected)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c6643a6..6eb2443 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -983,15 +983,16 @@ datetime module, available in Python 2.3+.")
(define-public python-pandas
(package
(name "python-pandas")
- (version "0.18.0")
+ (version "0.18.1")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "pandas" version))
+ (uri (string-append
+ "https://pypi.python.org/packages/11/09/";
+ "e66eb844daba8680ddff26335d5b4fead77f60f957678243549a8dd4830d/"
+ "pandas-" version ".tar.gz"))
(sha256
- (base32 "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9"))
- (patches (search-patches
- "python-pandas-fix-tslib-test-failure.patch"))))
+ (base32 "1ckpxrvvjj6zxmn68icd9hib8qcpx9b35f6izxnr25br5ilq7r6j"))))
(build-system python-build-system)
(propagated-inputs
`(("python-numpy" ,python-numpy)))
@@ -999,8 +1000,7 @@ datetime module, available in Python 2.3+.")
`(("python-pytz" ,python-pytz)
("python-dateutil" ,python-dateutil-2)))
(native-inputs
- `(("python-nose" ,python-nose)
- ("python-setuptools" ,python-setuptools)))
+ `(("python-nose" ,python-nose)))
(home-page "http://pandas.pydata.org";)
(synopsis "Data structures for data analysis, time series, and statistics")
(description
@@ -1009,15 +1009,15 @@ structures designed to make working with structured
(tabular,
multidimensional, potentially heterogeneous) and time series data both easy
and intuitive. It aims to be the fundamental high-level building block for
doing practical, real world data analysis in Python.")
- (license bsd-3)))
+ (license bsd-3)
+ (properties `((python2-variant . ,(delay python2-pandas))))))
(define-public python2-pandas
- (let ((pandas (package-with-python2 python-pandas)))
- (package (inherit pandas)
- (propagated-inputs
- `(("python2-numpy" ,python2-numpy)
- ,@(alist-delete "python-numpy"
- (package-propagated-inputs pandas)))))))
+ (let ((base (package-with-python2 (strip-python2-variant python-pandas))))
+ (package
+ (inherit base)
+ (native-inputs `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-inputs base))))))
(define-public python-tzlocal
(package