From 59fcdd26c66a70e602ad8aa575149d18bfa5cb6d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 21 Dec 2014 18:30:20 +0000 Subject: [PATCH] dev-python/pandas: Version Bump; Allow fast testing via FAST_PANDAS=true; drop dead functions Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- dev-python/pandas/ChangeLog | 9 +- dev-python/pandas/Manifest | 46 ++++--- .../files/pandas-0.15.1-enconding.patch | 21 +++ .../pandas/files/pandas-0.15.2-zoneinfo.patch | 87 ++++++++++++ dev-python/pandas/pandas-0.15.0.ebuild | 30 +--- dev-python/pandas/pandas-0.15.1.ebuild | 35 ++--- dev-python/pandas/pandas-0.15.2.ebuild | 129 ++++++++++++++++++ dev-python/pandas/pandas-9999.ebuild | 37 ++--- 8 files changed, 295 insertions(+), 99 deletions(-) create mode 100644 dev-python/pandas/files/pandas-0.15.1-enconding.patch create mode 100644 dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch create mode 100644 dev-python/pandas/pandas-0.15.2.ebuild diff --git a/dev-python/pandas/ChangeLog b/dev-python/pandas/ChangeLog index 49511269ee51..4af6baf41e43 100644 --- a/dev-python/pandas/ChangeLog +++ b/dev-python/pandas/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pandas # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.38 2014/12/20 09:27:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.39 2014/12/21 18:29:37 jlec Exp $ + +*pandas-0.15.2 (21 Dec 2014) + + 21 Dec 2014; Justin Lecher pandas-0.15.0.ebuild, + pandas-0.15.1.ebuild, +pandas-0.15.2.ebuild, pandas-9999.ebuild, + +files/pandas-0.15.1-enconding.patch, +files/pandas-0.15.2-zoneinfo.patch: + Version Bump; Allow fast testing via FAST_PANDAS=true; drop dead functions 20 Dec 2014; Michał Górny pandas-0.15.0.ebuild, pandas-0.15.1.ebuild: diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest index e9c04e58e318..4936b8c47210 100644 --- a/dev-python/pandas/Manifest +++ b/dev-python/pandas/Manifest @@ -1,33 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX pandas-0.13.1-backport-test-fix.patch 1113 SHA256 8e4a9c3bcfe43684564e7ade67d4c48bddd7397617184659b9ad93b1c64f8f44 SHA512 0d6e10973da2cafcf458df545ae1aa154bd18cb0128589106d6428ae8fc1ce230c1dc8e5059de7af91246e55415bbd290aa4d71d93558f7bd4fa562cc11f0516 WHIRLPOOL 8be4f75254c527c53777cfa60fdf5703b64090dedd2b16e1a29e70a64f40e64fe80478aa5a32070128bd3969a41e87e56da9c183e4ba3ab4745669c966c703ba AUX pandas-0.15.0-backport-GH8587.patch 1152 SHA256 25f626106fdbc28ebdb579fea6cca770080a831746aea5b5f721a6e3f3947ff8 SHA512 cc39941dc0562d01ba1ac3ee3a8a4eaf00dced564dc79b3fd9a39d671daa76479cd12f28d08b306ff0c279ecb8df2bddc37b028373b0c487f94398ff04bb9089 WHIRLPOOL e8e333170ad379575a0427201c53c1b1e9fecddc71c90f0ce9c8735c3b5071a702a0a9f33dd2f957cdb09eb69a9c5a70f8f16e9cd27371da33cfaee32c0f731e AUX pandas-0.15.1-datetutil-2.3.patch 2479 SHA256 1decf8931ffdf98960be30a666884d2c601ea77be86b1fc74112d008ea75f4e3 SHA512 ac9108878b5a1adfd8f55d5803153ec21b1781817953b7677cc304689139a5c1a5f5c0ab95ec8b6df1c2c1621f801658f6e2256a967e4bc35f100ca875b8c87d WHIRLPOOL 6a4bb027ff8f8047cb3bc41fe3eab57bf6d26f69c5a98472ff3be338353e42fae376d3366b0f48bbd2690ea44d9bb11a4f2fe4c63e37e8521382ab8cbfcb54f7 +AUX pandas-0.15.1-enconding.patch 698 SHA256 2a0fa1976617c7f3e707677ccab188f6dc2bc3e9987cc7c8758be83eda885fa0 SHA512 feb1bb7b037df3a826f39130e652137147fd0aafe960c31a26eb23d449d2f1258bbc37bae8408d627ece4188452e6aeecd2d0aa1245000a5aed7b9eee15ff9c5 WHIRLPOOL 727dfe145b4aa89c350f600804d44f29ceb19a2424255f1ac7ce2d4df843a214d360d6e6f2266996911d28ff2436576bc52fe14a2083797e7acdf9cda1bc5b0c AUX pandas-0.15.1-skip-tz-test.patch 1124 SHA256 b98d7a46e7819ce86004ee92350ec0e0a65cc11e2d94240c147762ca715aa7ea SHA512 73f85e4c4c3f260b7e19adbcec8370783fddf802ccd015293d0b4a972839141983c6d63819314a6acd9cc82bb8da06dcb2358678a9229aa8481db899d945a3b9 WHIRLPOOL 4436a61fa2b00a8ce93aa2eca37e6dca698b0c78938fdbff9d6970815661a6dd201aca50ce11e229d7e6489ece372c3807013b63105a0f6d94690f6e438a5435 +AUX pandas-0.15.2-zoneinfo.patch 4019 SHA256 443dd95173d333fb94783aa2f231172584dac3b2bef5a404788111382bf3f6a3 SHA512 fa628525fac2380a93f3b5afe1e0c193be6204bfc5a061df231fdd69481ca606518304f05ace6d2c78170ba1f665e1348a345c6d84824a7702138f0423261eb4 WHIRLPOOL d29a5e29add765bb35d47273bc46e39730154cf331b3f1cfdd854237fc6bcedefd725fa9dd44ae3d52f4e56777947d4251d2c10252a6a623b186e4bb0b3fbafc DIST pandas-0.15.0.tar.gz 4481754 SHA256 53be655079f978831dbb10c69a7656d3df6de673948896e170f08c3dac957cf0 SHA512 3c6026f82f8e9e781d2c46ff67bdb736404f815e92b0f831b3354fe2defe69f35550340db7f2a7724f19359cddb3cd45fac4d781c935f7469e10de836febc86a WHIRLPOOL ebc90d139e7b44d59d51eb8fd7386dc685545c759ddfafd2cef68ab7146db4ab64a308af0d90fc9ed2aba8c68ac66fbbec2867f900ca288a3dbc201c2facb963 DIST pandas-0.15.1.tar.gz 4508211 SHA256 6c15aebaf10a02fa411f336d2029fb303892b17d470f5d7de91597fc31cebd65 SHA512 2485c06a3fdf4bec479ed4a633901041283737f203ca1ab92130fbbd0236bd2198513079012e9af4c735768c8c2a70a477e3841e382661cb11d7ae00f6d72dce WHIRLPOOL 67a1cdaae88e6f5735d513d96471b2667e8f028c17f1708cfb2c8a64e0485ab2d2636fd65fc5b163f2b916b80374d660d1d6c20e7a1662112559cae1ddef0aa1 -EBUILD pandas-0.15.0.ebuild 4239 SHA256 6dd3e7baeea97672fd298fb690d940997d782f45e7ffc5e6fe19409f6ef3545f SHA512 c9944b9a18cd4a9c7467647ac5dcce8ca43dd538279402b72f329ad6f82a1adeb0b3694e666848442e993cdb2667900cf9ae21f67bf16bb13caf5ae8dff66b9f WHIRLPOOL 6ecdab440b951b38be6245a7731b73b271f9e0466bbf31c32c5adb69672963f45d84a555e510be48e40dcc28481a7b03292420f0e64b17e0ad1b5b1af7b591e3 -EBUILD pandas-0.15.1.ebuild 4223 SHA256 94bbacc099079e07558e4843c239e6e503631c42645c4e40c1fd8530c07c71f4 SHA512 3996b7ff1a99e255a9d33725e0a5e1a2e9e6fed98d67744b77b220c8408804951afe1e6df6124c4d79e5b9e1c178af26254881546c33af31f4ece9243db029fa WHIRLPOOL 8ff75acea99708de129cc67260d3d1fbe8886a31235dc7559c1a8df29cfd562d4221f9f2f786539e6d40d003eb10f988a730bc738b3f56c1adfffb7e447fa843 -EBUILD pandas-9999.ebuild 4151 SHA256 d211d73d336aabc6a5da763b77a1e862037afa8f9f1176ab0b8cc7cbc871a7e6 SHA512 b32e69e7582079568fea18d8b4f4d3dacbdc27f4ee87260ce4ff3fd9c8a9cbe6e02697305741b1c813a4195a317dce528ec1c86ea8cb41a3b025197362625461 WHIRLPOOL ac5a3cc18962286021a6b9e5ab2bc6199f673d0f64e55032ff2167768beeacb8373e982f90cf1e9c48e280a232dfeb42544fc810f77c7e962ba6b4ba03e19a3e -MISC ChangeLog 6285 SHA256 28011625b81750d8622776abbdfd4267a6020b1361b9d0b6c3dfc3628989a71a SHA512 7135b16bc64376c6e290611db8e74863c94ed4858ce236a4f9c5a49974e15e71201f640086139ee6023fc5f96b3cd02f57bd642fd23d02642f67863609ae4781 WHIRLPOOL d48f4f1fe6b2906dfcd3551f9eb8f369267b0fc8736df92d086c593e2c61030b54f8b04b9a5f5ba554e6968184219599c000ad6022de9ecdb0e810ff716c5953 +DIST pandas-0.15.2.tar.gz 4575541 SHA256 4a1ded49c77e109e2d5d078248f1f809962d81b508541c702d25a369af27ba17 SHA512 cc7e9c4baf7b3cce7793ea75d6c5e76f6238961f40b5045b209b046d5338762c1815b2bf62e39a56ae6c3a2d1a07ab6c7f8c5a769f9086913e573507a3ba1c41 WHIRLPOOL 0a277169d45148cd66c2f3e2cd402bcfd3dc44db2b73a05055e163b1e5f9afe817acbdf2b978112999b6cc877b5f31dbaf3990bd050cf8f1726a189c70f678d0 +EBUILD pandas-0.15.0.ebuild 3888 SHA256 90fa36fc41f48fc47937f9060c1f14a69ca35af5207af8f2adc371b74010d405 SHA512 66688e4c57337ed72a7c35eb0eeed23cead940d2ad7867d1d5250806ba08150a15a265bf6a77fb42071cc26e31b9bc4f90d78c8bd8893bcb456068b75f268f92 WHIRLPOOL 0e4db488211ff0b1ed45e5e427020b96bfc046032f324a092bf1dae46e44492d309c05f8b0b128e1915935ebebfe8973a085b4c2e10d3f7c98b26e12a4728eac +EBUILD pandas-0.15.1.ebuild 4003 SHA256 f5504d8f903f19def68e81090f6db4132dedcde3db82f3e9e50821f59ea2b44a SHA512 6e41e1ea240cb01b9cc3b40bb5ae9cca3e26f66861bbec5891586645106c7488ef86121bdc3e5058790489a609b30fbcb5c5c3b99ca9d8435db12c25b9eeed13 WHIRLPOOL b92f2afffb4cd2307326d8e0ebc6659e08c73fa6a33e96d25324dd32dad4a82ceb713aeb3f42f665ffabbcaa469c67d30f63ed102c0cf3b9dad98a959b5d0fb5 +EBUILD pandas-0.15.2.ebuild 3915 SHA256 c0eddceb2af9da9e604c18334515d5167a162006caccc5e5b547766fadf342af SHA512 a7a630b1099b26324d0ac4f1bee46fa678df7fd9222e60897f372d4990f1ae323bbd5583050a11577b5128fbb3fd121fc1c8e97a15f7ece9c21205ef377e636c WHIRLPOOL 491af08357393a10da9570cc3930cd34fda21456d0eba53c7fccf54513e797f87878032f393c9774df554b930d296ff5e3325fb12f7d01da285fceacf95d1a19 +EBUILD pandas-9999.ebuild 3905 SHA256 f65270fe04d934ec707149715b4926f6a0647e8b0b7aee8f923998a6ac82ae2e SHA512 3c23da4f156b197a257a04f63c3fae88464f659d9ba52204e0000d809927802e6b7d9adeb676d2806eca720c974e64bb00856f3ec0c39aeb4a1330e1acd07d6f WHIRLPOOL 445d05e9409248b199a8ced9a6ab8a4382ccbe99fbbed7a6efd4e2b75a39afb3ac02e881d54a73500318ce0cbe810e12751a704f12b1ef3425f5cf6b55086e5f +MISC ChangeLog 6604 SHA256 87042a4348618a86db10aaed086497b34fa28a2398e37b7583f432f1910178f2 SHA512 5f9f273df7fac07e6bcebaa0a388ec56fd12d954188f31f55d7ada1ce7f354164748c2e18bb89cb03f0a62d9f5a2a5ce37400a2e8261dfbb3738f1573afda853 WHIRLPOOL a897071d1484b5ebb1ae845564390354a1f2d5b818ce645b06682e01121cfae85c94cda5ae3dba6eb15442eedbfa4b1acb506e8cf6c587b322aeb67ddc50ea3d MISC metadata.xml 889 SHA256 51b2b0eb0f69bb79e5c93561fd4586a35f4d69f9f59475eff64afbac3d76e908 SHA512 1c265ddf64486f6a469936b6a43eb68b6b6c46efe010fd237ddbd16ba1af59d4817b266942cec95bbde92c7d01795de95893dd851815978f8133241afbf2efb8 WHIRLPOOL b34af1861bff3d7eb9ac4fcf648b2c7d0ff0c23ce99fb1190e7603876f09a9338e8d4e5a9c0536e8f5a026ddf669cd7197a9fda3b50adf8aa3e39540fc99e153 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUlUEVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpucP/0UjRX2Za6qUyRwIgMBBmHe5 -pP27DnTgxIt9z3TfB6/KQKudFeTCovRbTqLSSBwpjYZuYlsE8TYR8c9jv5Ggi5fs -+qYXlrImbAX++72l8iBCvnZUQU6BUmcf5sfCJLgQ1rB1V82/xhiNT9CFEq7JY7ek -8d1jZxhNLGl+5bOBvsKKVn1g7YduJEnAPD+hwcWlaguSEpTpaIQdB4efOaH5ogiU -zo7QT1xScHo+XraGziClWL24IgLLQ+top53vXnthrUKYG9jImmNAPhlGac15iEuL -LaYMfenF/ce7l07O1mOHaxQ84REHjIthcpKYs8hFPF5OEwZxQxgj2Q/uVC/LZPoS -CT0N8oGEiadv3Ut1+tJY1ZgGyeDnX/dzD2vNB16U5ljJRQCGNZoyD5g7jdinFoNZ -dDH/AKk5fVfCMtYNaxJo9LxLFLihPvZoBnLQN9JavrJESMZzlosHmeBE/vignhVu -e8KZ4aJ5dEPDTzWQ5pcBZOgb3i0ljoBC2ZwlrxFfdTFC4NuuSiz6TrOmYweAtqdL -9lOM0fm1pNGnDCbBzQQh7e0tZHU7DZ0Nj12Q/8DiQ/C01XvnQfuM2bF4+sZKiIRl -DzShrD34Hv9mAHCc06ZJn+yg33r/FJypSQCxvKGaFQFFpfOZGMZT/kp6OKANQh3v -N2OOjqzcA50V38MzUlLr -=NA9N +iQJ8BAEBCgBmBQJUlxG7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirrroP/AytAl3qYtgZP4ODjFvzBPFA +4Jbhd3D7BCuMA/wE0MM4D9jLi4mYV71ek3Sg6IotlfotY8WabUkEA31og5WCGQbt +DvQFYLcVmCQ31OD/u+UAWxxu1TUcObm5+todcTnNxfttYPB8bEAKvBpluCw767s3 +Rqrbu8IeiMRggE3EybMKPTEOXLphL1DvifYWsgmPM9gP0a4IsfybYnKahYHfxNiz +c4tYzlybuNGfbuEEWVYNDJR60uXpx2sQk7f3XNJ/rzOgmuM8mxNRjDLxPf9sfH94 +W5q/iLtAb3RF6w4PHcw7OwyFdO1QD+NKIrI8POq+HfI6eQF21JRnsQWSDouBjMaj +ohUCdDjl7xt2lW7FJfssosC21BZd3C2S8F1ysjtIv4L40kmDyIqEKbLQMzzjjZ4m +/J4Y8ou+y3txxtnNKbWEUYLS4dZ5PIdtsaQb8Ag834M6EyKBsGvLRBr9ilAgg5bT +rLZpVQ+o68IjLloyuhjxeLf87s2Mr4LJEcSXcjhu6osTQZhQgAoSmj70fLt05gXJ +NOSlKmMuefVEO056BosfrnVD7rnouckouJIkhwCKHqzRgfcwqmmQQyT/stxsXlNE +Vq/1GrpOHxz/XOU8Ql0cB8vYHafMV3Uwr3eyh42Eyzfc0HBjH2Vu2NlR73F/yoRW +JYTqNZWw3ePKWDW2mOpM +=8ukn -----END PGP SIGNATURE----- diff --git a/dev-python/pandas/files/pandas-0.15.1-enconding.patch b/dev-python/pandas/files/pandas-0.15.1-enconding.patch new file mode 100644 index 000000000000..2f6ba73298c9 --- /dev/null +++ b/dev-python/pandas/files/pandas-0.15.1-enconding.patch @@ -0,0 +1,21 @@ +From c4bcc2054bfd2f89b640bea0c9a109b0184d6710 Mon Sep 17 00:00:00 2001 +From: Francesc Via +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 diff --git a/dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch b/dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch new file mode 100644 index 000000000000..f04f76d61c2a --- /dev/null +++ b/dev-python/pandas/files/pandas-0.15.2-zoneinfo.patch @@ -0,0 +1,87 @@ + 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 diff --git a/dev-python/pandas/pandas-0.15.0.ebuild b/dev-python/pandas/pandas-0.15.0.ebuild index 6713df61609e..d9b9d7bbc6d7 100644 --- a/dev-python/pandas/pandas-0.15.0.ebuild +++ b/dev-python/pandas/pandas-0.15.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.0.ebuild,v 1.8 2014/12/20 09:27:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.0.ebuild,v 1.9 2014/12/21 18:29:37 jlec Exp $ EAPI=5 @@ -78,14 +78,13 @@ RDEPEND="${CDEPEND} R? ( dev-python/rpy[${PYTHON_USEDEP}] )" PATCHES=( + # https://github.com/pydata/pandas/issues/8639 "${FILESDIR}"/${PN}-0.15.1-skip-tz-test.patch ) python_prepare_all() { - if use doc; then - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die - fi + # Prevent un-needed download during build + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die distutils-r1_python_prepare_all } @@ -100,25 +99,6 @@ python_compile_all() { fi } -_python_compile() { - # https://github.com/pydata/pandas/issues/8033 - if ! python_is_python3; then - local CFLAGS=${CFLAGS} - local CXXFLAGS=${CXXFLAGS} - export CFLAGS - export CXXFLAGS - append-cflags -fno-strict-aliasing - append-cxxflags -fno-strict-aliasing - fi - - distutils-r1_python_compile -} - -src_test() { - local DISTUTILS_NO_PARALLEL_BUILD=1 - distutils-r1_src_test -} - python_test() { pushd "${BUILD_DIR}"/lib > /dev/null VIRTUALX_COMMAND="nosetests" @@ -143,6 +123,6 @@ pkg_postinst() { local x elog "Please install" for x in ${EXTRA_DEPEND}; do - optfeature "additional functionality" ${x%%[*} + optfeature "additional functionality" "${x%%[*}" done } diff --git a/dev-python/pandas/pandas-0.15.1.ebuild b/dev-python/pandas/pandas-0.15.1.ebuild index 3c65d94e2d4d..1766c4652253 100644 --- a/dev-python/pandas/pandas-0.15.1.ebuild +++ b/dev-python/pandas/pandas-0.15.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.1.ebuild,v 1.7 2014/12/20 09:27:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.1.ebuild,v 1.8 2014/12/21 18:29:37 jlec Exp $ EAPI=5 @@ -78,14 +78,14 @@ RDEPEND="${CDEPEND} R? ( dev-python/rpy[${PYTHON_USEDEP}] )" PATCHES=( + # https://github.com/pydata/pandas/issues/8639 "${FILESDIR}"/${P}-skip-tz-test.patch + "${FILESDIR}"/${P}-enconding.patch ) python_prepare_all() { - if use doc; then - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die - fi + # Prevent un-needed download during build + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die distutils-r1_python_prepare_all } @@ -100,30 +100,13 @@ python_compile_all() { fi } -_python_compile() { - # https://github.com/pydata/pandas/issues/8033 - if ! python_is_python3; then - local CFLAGS=${CFLAGS} - local CXXFLAGS=${CXXFLAGS} - export CFLAGS - export CXXFLAGS - append-cflags -fno-strict-aliasing - append-cxxflags -fno-strict-aliasing - fi - - distutils-r1_python_compile -} - -src_test() { - local DISTUTILS_NO_PARALLEL_BUILD=1 - distutils-r1_src_test -} - python_test() { + local test_pandas='not network and not disabled' + [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' pushd "${BUILD_DIR}"/lib > /dev/null VIRTUALX_COMMAND="nosetests" PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - virtualmake --verbosity=3 -A 'not network and not disabled' pandas + virtualmake --verbosity=3 -A "${test_pandas}" pandas popd > /dev/null } @@ -143,6 +126,6 @@ pkg_postinst() { local x elog "Please install" for x in ${EXTRA_DEPEND}; do - optfeature "additional functionality" ${x%%[*} + optfeature "additional functionality" "${x%%[*}" done } diff --git a/dev-python/pandas/pandas-0.15.2.ebuild b/dev-python/pandas/pandas-0.15.2.ebuild new file mode 100644 index 000000000000..2231dc0246cc --- /dev/null +++ b/dev-python/pandas/pandas-0.15.2.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.2.ebuild,v 1.1 2014/12/21 18:29:37 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 eutils flag-o-matic virtualx + +DESCRIPTION="Powerful data structures for data analysis and statistics" +HOMEPAGE="http://pandas.sourceforge.net/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples excel html test R" + +EXTRA_DEPEND=" + >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)] + dev-python/openpyxl[${PYTHON_USEDEP}] + dev-python/pymysql[${PYTHON_USEDEP}] + dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)] + dev-python/psycopg:2[${PYTHON_USEDEP}] + dev-python/statsmodels[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] + " +CDEPEND=" + >dev-python/numpy-1.7[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] + !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND} + doc? ( + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/ipython[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] + dev-python/openpyxl[${PYTHON_USEDEP}] + >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/rpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] + dev-python/xlrd[$(python_gen_usedep 'python2_7')] + dev-python/xlwt[$(python_gen_usedep 'python2_7')] + x11-misc/xclip + ) + test? ( + ${EXTRA_DEPEND} + dev-python/nose[${PYTHON_USEDEP}] + x11-misc/xclip + x11-misc/xsel + )" +# dev-python/statsmodels invokes a circular dep +# hence rm from doc? ( ), again +RDEPEND="${CDEPEND} + >=dev-python/numexpr-2.1[${PYTHON_USEDEP}] + dev-python/bottleneck[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/pytables[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + excel? ( + >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] + dev-python/xlrd[$(python_gen_usedep 'python2_7')] + dev-python/xlwt[$(python_gen_usedep 'python2_7')] + ) + html? ( + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + || ( + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] ) + ) + R? ( dev-python/rpy[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}"/${P}-zoneinfo.patch +) + +python_prepare_all() { + # Prevent un-needed download during build + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + # To build docs the need be located in $BUILD_DIR, + # else PYTHONPATH points to unusable modules. + if use doc; then + cd "${BUILD_DIR}"/lib || die + cp -ar "${S}"/doc . && cd doc || die + LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die + fi +} + +python_test() { + local test_pandas='not network and not disabled' + [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' + pushd "${BUILD_DIR}"/lib > /dev/null + VIRTUALX_COMMAND="nosetests" + PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ + virtualmake --verbosity=3 -A "${test_pandas}" pandas + popd > /dev/null +} + +python_install_all() { + if use doc; then + dodoc -r "${BUILD_DIR}"/lib/doc/build/html + einfo "An initial build of docs is absent of references to statsmodels" + einfo "due to circular dependency. To have them included, emerge" + einfo "statsmodels next and re-emerge pandas with USE doc" + fi + + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + local x + elog "Please install" + for x in ${EXTRA_DEPEND}; do + optfeature "additional functionality" "${x%%[*}" + done +} diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild index b70084896428..d967c2fd75ad 100644 --- a/dev-python/pandas/pandas-9999.ebuild +++ b/dev-python/pandas/pandas-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-9999.ebuild,v 1.6 2014/12/12 07:47:58 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-9999.ebuild,v 1.7 2014/12/21 18:29:37 jlec Exp $ EAPI=5 @@ -78,11 +78,13 @@ RDEPEND="${CDEPEND} ) R? ( dev-python/rpy[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/${PN}-0.15.2-zoneinfo.patch +) + python_prepare_all() { - if use doc; then - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die - fi + # Prevent un-needed download during build + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die distutils-r1_python_prepare_all } @@ -97,30 +99,13 @@ python_compile_all() { fi } -_python_compile() { - # https://github.com/pydata/pandas/issues/8033 - if ! python_is_python3; then - local CFLAGS=${CFLAGS} - local CXXFLAGS=${CXXFLAGS} - export CFLAGS - export CXXFLAGS - append-cflags -fno-strict-aliasing - append-cxxflags -fno-strict-aliasing - fi - - distutils-r1_python_compile -} - -src_test() { - local DISTUTILS_NO_PARALLEL_BUILD=1 - distutils-r1_src_test -} - python_test() { + local test_pandas='not network and not disabled' + [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow' pushd "${BUILD_DIR}"/lib > /dev/null VIRTUALX_COMMAND="nosetests" PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - virtualmake --verbosity=3 -A 'not network and not disabled' pandas + virtualmake --verbosity=3 -A "${test_pandas}" pandas popd > /dev/null } @@ -140,6 +125,6 @@ pkg_postinst() { local x elog "Please install" for x in ${EXTRA_DEPEND}; do - optfeature "additional functionality" ${x%%[*} + optfeature "additional functionality" "${x%%[*}" done } -- 2.26.2