From be6ac200555ad4277ed6d63590d9602c9a9580db Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 7 Dec 2014 16:58:03 +0000 Subject: [PATCH] dev-python/pandas: Drop old; Version BUmp; backport testsuite patch, #521880 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- dev-python/pandas/ChangeLog | 12 +- dev-python/pandas/Manifest | 41 +----- .../files/pandas-0.15.0-backport-GH8587.patch | 31 +++++ .../files/pandas-0.15.1-skip-tz-test.patch | 24 ++++ dev-python/pandas/pandas-0.12.0.ebuild | 117 ----------------- dev-python/pandas/pandas-0.13.0.ebuild | 118 ----------------- dev-python/pandas/pandas-0.13.1.ebuild | 122 ------------------ dev-python/pandas/pandas-0.15.0.ebuild | 42 +++++- ...das-0.14.1.ebuild => pandas-0.15.1.ebuild} | 62 ++++++--- ...andas-0.14.0.ebuild => pandas-9999.ebuild} | 76 +++++++---- 10 files changed, 200 insertions(+), 445 deletions(-) create mode 100644 dev-python/pandas/files/pandas-0.15.0-backport-GH8587.patch create mode 100644 dev-python/pandas/files/pandas-0.15.1-skip-tz-test.patch delete mode 100644 dev-python/pandas/pandas-0.12.0.ebuild delete mode 100644 dev-python/pandas/pandas-0.13.0.ebuild delete mode 100644 dev-python/pandas/pandas-0.13.1.ebuild rename dev-python/pandas/{pandas-0.14.1.ebuild => pandas-0.15.1.ebuild} (67%) rename dev-python/pandas/{pandas-0.14.0.ebuild => pandas-9999.ebuild} (58%) diff --git a/dev-python/pandas/ChangeLog b/dev-python/pandas/ChangeLog index 29ae42a3a104..fa8102da0a89 100644 --- a/dev-python/pandas/ChangeLog +++ b/dev-python/pandas/ChangeLog @@ -1,6 +1,16 @@ # 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.31 2014/10/26 19:41:19 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.32 2014/12/07 16:57:02 jlec Exp $ + +*pandas-9999 (07 Dec 2014) +*pandas-0.15.1 (07 Dec 2014) + + 07 Dec 2014; Justin Lecher -pandas-0.12.0.ebuild, + -pandas-0.13.0.ebuild, -pandas-0.13.1.ebuild, -pandas-0.14.0.ebuild, + -pandas-0.14.1.ebuild, pandas-0.15.0.ebuild, +pandas-0.15.1.ebuild, + +pandas-9999.ebuild, +files/pandas-0.15.0-backport-GH8587.patch, + +files/pandas-0.15.1-skip-tz-test.patch: + Drop old; Version BUmp; backport testsuite patch, #521880 *pandas-0.15.0 (26 Oct 2014) diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest index c87cacb20916..c81009c25b3d 100644 --- a/dev-python/pandas/Manifest +++ b/dev-python/pandas/Manifest @@ -1,37 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX pandas-0.13.1-backport-test-fix.patch 1113 SHA256 8e4a9c3bcfe43684564e7ade67d4c48bddd7397617184659b9ad93b1c64f8f44 SHA512 0d6e10973da2cafcf458df545ae1aa154bd18cb0128589106d6428ae8fc1ce230c1dc8e5059de7af91246e55415bbd290aa4d71d93558f7bd4fa562cc11f0516 WHIRLPOOL 8be4f75254c527c53777cfa60fdf5703b64090dedd2b16e1a29e70a64f40e64fe80478aa5a32070128bd3969a41e87e56da9c183e4ba3ab4745669c966c703ba -DIST pandas-0.12.0.tar.gz 3155059 SHA256 be9b4c3611801b366873531bc87a87dd16b19e7d78fa84c21898cd007931c86d SHA512 da5dbd6109f7c96b762fcdf695ed50da8059ca78f645b0dec9a741ed89638ba43f8b336d339d3d4c250585ddfddff240b40bb25e99ab642eed825c649f2fd59e WHIRLPOOL 19cb14eff3b397d80d2c33d55c980b1db1793c087048be9cc13718e50f6034aa3f15fe27866cc13f778fa71cf3c91147449865b9597087622fa9cf24e71d527d -DIST pandas-0.13.0.tar.gz 3604253 SHA256 5bb3f7a5f24fe8280e84e5407dc129364e7825cbe366b79676bd5f37a9b2bf0e SHA512 c5e2673f9a3b1e28d038bf3e5911445c8e77f4669eb5df5849062b41c96f93b6f09fa87421ae7382ba50f53c9ac0cf9564bbff5b300f097bf929fca366a500a6 WHIRLPOOL 91257ed915f7ead4d68e0ebf360f326e4e32e8de51c79c315902f297e3c05bd3a525861e6f575419c6c6eb141ecbb0228e6886c02be49a565324b319b0a65fd0 -DIST pandas-0.13.1.tar.gz 6096890 SHA256 6813746caa796550969ed98069f16627f070f6d8d60686cfb3fa0e66c2e0312b SHA512 a5fc36141f1b9269ce69ea35f8308abea3e6a77e54fe5df3d3614f1b9ea79f1c4b1c07da1b78d5d26f7ccf238a7c569a978caaa411217c290f7a1870e878e1f2 WHIRLPOOL a091570987c55190fe3650443392b4858938e7a77145a25859f2f9e479d1701876fa06a75610ef2771543cf8574ae992793c9377b6a246cab371edbd16a5eb40 -DIST pandas-0.14.0.tar.gz 6526846 SHA256 f7997debca756c4dd5ccdf5a010dfe3d1c7dac98ee706b715d994cf7c9d35528 SHA512 905782956e6aa1bc15c8dd407d2cb731b8bdeb38e4e85d149d1ba665b88c47ff38566b19e382a83a17ef5d09a19a627d77b9afdd96dc0c0abda62ad9152b4083 WHIRLPOOL 9e8bb971cef93fd15faba7a2a4f032f266849d5f1e7d2a8f0233b73cf26c97fa78044de8617ea54b3d991591758c57bec2cb2a913b7d7735d858c420fe6bef65 -DIST pandas-0.14.1.tar.gz 6713272 SHA256 8d36f69e63f4c36999d142d60e476a6359c77069ad0ed1e4aa16a7005884dd21 SHA512 9447aff4004cef215914cc8ce448dbffff9c6442e4895f217b240d3cddc709d0c4f3c2d43b145eb3cbf48a0492ddefc4647c44304987e205b2a2aef081a247a8 WHIRLPOOL 7091c3e1861af787710cd4afa7c74499f28082fff6382201f9706d8d36c6af81730c3f5364ee22810fb8509c60357be0cf17480e35150163f32f858b9431dd25 +AUX pandas-0.15.0-backport-GH8587.patch 1152 SHA256 25f626106fdbc28ebdb579fea6cca770080a831746aea5b5f721a6e3f3947ff8 SHA512 cc39941dc0562d01ba1ac3ee3a8a4eaf00dced564dc79b3fd9a39d671daa76479cd12f28d08b306ff0c279ecb8df2bddc37b028373b0c487f94398ff04bb9089 WHIRLPOOL e8e333170ad379575a0427201c53c1b1e9fecddc71c90f0ce9c8735c3b5071a702a0a9f33dd2f957cdb09eb69a9c5a70f8f16e9cd27371da33cfaee32c0f731e +AUX pandas-0.15.1-skip-tz-test.patch 1124 SHA256 b98d7a46e7819ce86004ee92350ec0e0a65cc11e2d94240c147762ca715aa7ea SHA512 73f85e4c4c3f260b7e19adbcec8370783fddf802ccd015293d0b4a972839141983c6d63819314a6acd9cc82bb8da06dcb2358678a9229aa8481db899d945a3b9 WHIRLPOOL 4436a61fa2b00a8ce93aa2eca37e6dca698b0c78938fdbff9d6970815661a6dd201aca50ce11e229d7e6489ece372c3807013b63105a0f6d94690f6e438a5435 DIST pandas-0.15.0.tar.gz 4481754 SHA256 53be655079f978831dbb10c69a7656d3df6de673948896e170f08c3dac957cf0 SHA512 3c6026f82f8e9e781d2c46ff67bdb736404f815e92b0f831b3354fe2defe69f35550340db7f2a7724f19359cddb3cd45fac4d781c935f7469e10de836febc86a WHIRLPOOL ebc90d139e7b44d59d51eb8fd7386dc685545c759ddfafd2cef68ab7146db4ab64a308af0d90fc9ed2aba8c68ac66fbbec2867f900ca288a3dbc201c2facb963 -EBUILD pandas-0.12.0.ebuild 3654 SHA256 851dc4547bc39ccca9e40103b058f2d15d7fdf54fffd926995fa8c45472a2e9b SHA512 ee82fe8878fb36b9cfd2ac1584a62ebbf36ce4c59d79c5c901667297e68977309eca1b79090fb6dd17608ee5feef4d2669ba857580c08016fd3213c23b5b5ed6 WHIRLPOOL db99a58b8c803a5f3c9bf7ba5f0f1c2c6a191e18a407fde45f06f93c3112f191781181b3cef060ecd6a1d1f8a37d2b347cea0f89a5be8127e38dc9e98cfea29b -EBUILD pandas-0.13.0.ebuild 3651 SHA256 e0b995fae639c7b0c4aefeae07850b7574028ee1d37858bbd0be719b24aeeb73 SHA512 401f7e8c63cbd25e6a941944da75acc8f0468d08091748a74f25477cbe69ac3823178c1270be09db22d9c6268253cb35075867783fd46bf05803e5b6a668a142 WHIRLPOOL 15555cf0645fd85cbc0ddaa1aa1cc93567352197c5ef12125d64ca163b612208af6437d9dbaf6ddba255d71555caf0b5edfba5baa28ddec3c4f8781e221794f0 -EBUILD pandas-0.13.1.ebuild 3715 SHA256 69ce79c501f5680453c385195ad4a875b3eb700ecc40009ddcd2c0e01f6494fb SHA512 305458dd4617a428540ffc19db375d2ad76080dced6846bb504564b85cceb4394177d3cb5f8ecfebba668f4801f23aaa0095618dd4f30c7219fdd86d72419aa8 WHIRLPOOL b6918bb4cd51e5e08f111382ffabaf23e992459df96828abe049a9a0f69e1a0bd58935a1a4ff167a0ce24441a43efafca0f1c1f2b81466be7ecca505042ae678 -EBUILD pandas-0.14.0.ebuild 3551 SHA256 ca68fdaf324644719f3928e58b7f7edfe932aaaa4d3c10fa10e32e88cfdfe4aa SHA512 e9b83d3d7b3527282fa728a043ed2e62def69c6ac211682c0ba6769b89da08eeca67ad265106ab30aaafe899c5125a04a9cc25c77906cf88219763728c7a0053 WHIRLPOOL 686b6c9fec9a6ce1c993c4f5a9a0b8ad8ae757f9199780df79ba9ce0aea39354b60405314b0ea512b3ff3d378a9974410c94eb7b2946c5c519cc0baa64cb1582 -EBUILD pandas-0.14.1.ebuild 3741 SHA256 e437ff1838b8c61c81ff30fe1f4177922668cafd781e006e80bca122207d6fd1 SHA512 38d7740807ea92136d310a134388543a5a654633f0446960c86aea9dcf8cff5ce0fe4ba6dc65167053c059024a20550c93898632c7167a2d24df861622e891c5 WHIRLPOOL 01aee3067fbc19b0254164490bdd104cf552d901433e6c987f98a1e0eedef50d4433feec090cce831db2f66b3b39b82ae4882f68650e58244045cf8c5a269948 -EBUILD pandas-0.15.0.ebuild 3531 SHA256 656d0737c81a25271e3a2ac1bfe9f492e8c4c1966177a409a2a0625f28c39acb SHA512 91d0cb8a149e6c99c16a774b388e49ebfe8f67f0540c1e7fc5d14f0bb4bd08c6638865bb39f035e63b1098037754819e3f38326cae2a15d8b87ff522e4983a4c WHIRLPOOL 0b54f86256bcaf344b4c35b155d4d7e3d218fdc7768053a816787141a162bf4b245b02a1839d419d05e6f3186e012653527ee7b6ce4291e94c0ae56c944be8cd -MISC ChangeLog 4934 SHA256 2b61f809f36d66421a79cbbb94d271759a6261bb02c65cb84e4e27ce7091b727 SHA512 bd3bf70bab4bfeea7232951801e019ffe6a7758e38397e5b8f0e34ea5b4b9b12fb100ad41e1a19bbefa59cc2486118ff820c855a5f2716734caa0c5f9141c1cb WHIRLPOOL a686a6407e0c6e5ba7b0efeaab5964f3a2425ee87924d69394a2c9bef05eea81e642aadce6d6d53c155f603b8145ead7eeb081bdcceb3ce5741f7c40b03572c2 +DIST pandas-0.15.1.tar.gz 4508211 SHA256 6c15aebaf10a02fa411f336d2029fb303892b17d470f5d7de91597fc31cebd65 SHA512 2485c06a3fdf4bec479ed4a633901041283737f203ca1ab92130fbbd0236bd2198513079012e9af4c735768c8c2a70a477e3841e382661cb11d7ae00f6d72dce WHIRLPOOL 67a1cdaae88e6f5735d513d96471b2667e8f028c17f1708cfb2c8a64e0485ab2d2636fd65fc5b163f2b916b80374d660d1d6c20e7a1662112559cae1ddef0aa1 +EBUILD pandas-0.15.0.ebuild 4208 SHA256 d9e952e66c459f15681687bdf81922bb184b36db6aafa1652296df2f3b85718d SHA512 92ee24aa3b0eefa957824201e026bcf5ee642fcd9cc04413b7d08519cbd5ede6411cd2cdfb8f0c6b01f811bf23bd5ac54073fa162eabd5bf303fc8015e1bda90 WHIRLPOOL 0e9af11ca50029134b5dbb94008f8f3e1ee51dcd8a5d302835a5220bec7006c811425aeb9b6abc02e180313d01378bf4ce62cbe991333a4085cd874ce602c037 +EBUILD pandas-0.15.1.ebuild 4205 SHA256 ddecfa25ce3550085c9a290c889c6dd24f1dd5ea01e5af433ad6ab85fb9c98fe SHA512 08d8bb60f2af194a16470ac6720d60106de73b934e7653f41249a2f22a586c39328abd9245f6c2bb524df1cec87c033794d326a584cb472f6781cf1832ff93e8 WHIRLPOOL 768b79937c696a05114c507b629fccb493e530855a884ae0f2d2ebc383ffa64318ce61aeb2da60384be8664a4745dbf643876827a49e9de3da737af5b36897d6 +EBUILD pandas-9999.ebuild 4135 SHA256 11b71694bfd91d04da5a35b307e9509de4d9dfd1fd6c24abb8cd28d07fb9a9c6 SHA512 ecb902f2bf0419ab466a0dfdc5a83a277c633ab0403a79bb9d4ba902cd5c05b651ff6c6397794fa0dd812659034354817a7fc4cc714f812779c01850de37c1f2 WHIRLPOOL 697a2d9e90384c08a1f1729f5587ecd1803eb1b923c32c66b250a7245ca803f690a9faf98c43814c9f5104e0306be5d0631bf7f6505bf6e958bd486b10b2aca1 +MISC ChangeLog 5373 SHA256 dd74ba69600febb122bf57a1fa8b617210659b8f74f14c6c38b7223787a53686 SHA512 c58384a3f9b60d28c027452ea432fe1f90bf8ad800f3c81f9afbb5c3d85992873ec5a96fd84e2cb5a41187081597376383958f5cb3a3861b522c20d6797d95a5 WHIRLPOOL cab1779bf35841d1d219b6dabb7d6748275df0dfdb139fc80436a3c60bdafb5c4f08cdb7d9dec2dfbe0a60f0595747935f942582fd760b756318e97b1a6878a1 MISC metadata.xml 889 SHA256 51b2b0eb0f69bb79e5c93561fd4586a35f4d69f9f59475eff64afbac3d76e908 SHA512 1c265ddf64486f6a469936b6a43eb68b6b6c46efe010fd237ddbd16ba1af59d4817b266942cec95bbde92c7d01795de95893dd851815978f8133241afbf2efb8 WHIRLPOOL b34af1861bff3d7eb9ac4fcf648b2c7d0ff0c23ce99fb1190e7603876f09a9338e8d4e5a9c0536e8f5a026ddf669cd7197a9fda3b50adf8aa3e39540fc99e153 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCgBmBQJUTU5kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1S4P/As0MBNXCcflJJHGrLT9/QVk -6Dj1Jxpye7OlfTzIGkJPwIg8TnYSCB1j/Fl/GQB+f0bZDDXqXSNn4RdH9rVXJIuU -v+pCniIvbUmLN/8C9PfI/UfGvJP86U+q2FJzalEWKmNqaWiQTySOBo954PnINvV8 -+a5tnJM2qjrRFcfeC7xmGiuDkqHYNAlCvKJgtzWQhUiOXs06ngKhCKIqllLj8U0T -w9vhpKFMsJwRfdrDOhA49569ZMaZu5svD/yaigGG2BjBz0vi/+yc9E54NwlTxaLD -9Hhq123ZTnjuQ2X2lhojWEhZuW3EG2hE2vHyGzEdt7MnTrvWsODeupKpTuBiJuPY -VO/Uf7veFdSaoI6eiHNwcc1dEajrEZlMq72E+6Nkdwl1Fd5LqkRAnVUz+9kOF450 -p4MB8f+bU8ksbIO3vJUko2Eb1EKEUK/n14VvzresA0kIXCvZFN6V6AwMiHgfmhLY -MbGLP8UhVblE0MNdGj0mBBWb+XuGI/03x1C1CEtA6ybPpa6IE8P3vFjjwWSVTfpH -RMip4OZXh4T34Ujh/DkNmee/gNIJz2BBwPnnJ32+SMHae02UcDM5VwN5ng5EGJqs -qiJtiGxeCH0K/D0i0vjadfZRY3SKTz0vI6dYH3srw1zEzixZIg0kk/nKvILZ0LW4 -IB2rjVSuE+Bye0qG310T -=9oQF ------END PGP SIGNATURE----- diff --git a/dev-python/pandas/files/pandas-0.15.0-backport-GH8587.patch b/dev-python/pandas/files/pandas-0.15.0-backport-GH8587.patch new file mode 100644 index 000000000000..d6c60bccbcc3 --- /dev/null +++ b/dev-python/pandas/files/pandas-0.15.0-backport-GH8587.patch @@ -0,0 +1,31 @@ +From 403f38da35ab04d3997f61db3c98134fe02910d3 Mon Sep 17 00:00:00 2001 +From: pallav-fdsi +Date: Sun, 19 Oct 2014 20:49:21 -0400 +Subject: [PATCH] BUG: invalid import checking in gbq (GH8587) + +--- + pandas/io/gbq.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pandas/io/gbq.py b/pandas/io/gbq.py +index abb743d..20c1e9f 100644 +--- a/pandas/io/gbq.py ++++ b/pandas/io/gbq.py +@@ -43,7 +43,7 @@ + _GOOGLE_API_CLIENT_INSTALLED=True + _GOOGLE_API_CLIENT_VERSION = pkg_resources.get_distribution('google-api-python-client').version + +- if LooseVersion(_GOOGLE_API_CLIENT_VERSION >= '1.2.0'): ++ if LooseVersion(_GOOGLE_API_CLIENT_VERSION) >= '1.2.0': + _GOOGLE_API_CLIENT_VALID_VERSION = True + + except ImportError: +@@ -56,7 +56,7 @@ + + _GOOGLE_FLAGS_VERSION = pkg_resources.get_distribution('python-gflags').version + +- if LooseVersion(_GOOGLE_FLAGS_VERSION >= '2.0.0'): ++ if LooseVersion(_GOOGLE_FLAGS_VERSION) >= '2.0': + _GOOGLE_FLAGS_VALID_VERSION = True + + except ImportError: diff --git a/dev-python/pandas/files/pandas-0.15.1-skip-tz-test.patch b/dev-python/pandas/files/pandas-0.15.1-skip-tz-test.patch new file mode 100644 index 000000000000..2226a12fc69f --- /dev/null +++ b/dev-python/pandas/files/pandas-0.15.1-skip-tz-test.patch @@ -0,0 +1,24 @@ + pandas/tseries/tests/test_timezones.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/pandas/tseries/tests/test_timezones.py b/pandas/tseries/tests/test_timezones.py +index 9fbdb71..62db007 100644 +--- a/pandas/tseries/tests/test_timezones.py ++++ b/pandas/tseries/tests/test_timezones.py +@@ -599,11 +599,12 @@ class TestTimeZoneSupportPytz(tm.TestCase): + self.assertTrue(self.cmptz(result.index.tz, self.tz('US/Eastern'))) + + def test_string_index_alias_tz_aware(self): +- rng = date_range('1/1/2000', periods=10, tz=self.tzstr('US/Eastern')) +- ts = Series(np.random.randn(len(rng)), index=rng) ++ raise nose.SkipTest("https://github.com/pydata/pandas/issues/8639") ++ #rng = date_range('1/1/2000', periods=10, tz=self.tzstr('US/Eastern')) ++ #ts = Series(np.random.randn(len(rng)), index=rng) + +- result = ts['1/3/2000'] +- self.assertAlmostEqual(result, ts[2]) ++ #result = ts['1/3/2000'] ++ #self.assertAlmostEqual(result, ts[2]) + + def test_fixed_offset(self): + dates = [datetime(2000, 1, 1, tzinfo=fixed_off), diff --git a/dev-python/pandas/pandas-0.12.0.ebuild b/dev-python/pandas/pandas-0.12.0.ebuild deleted file mode 100644 index 64b39d17174e..000000000000 --- a/dev-python/pandas/pandas-0.12.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.12.0.ebuild,v 1.5 2013/10/27 08:05:32 mgorny Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - -inherit distutils-r1 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" - -REQUIRED_USE=" - excel? ( !python_targets_python3_2 ) - doc? ( !python_targets_python3_2 ) - R? ( !python_targets_python3_2 ) -" - -CDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-dateutil[${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/pytables[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[$(python_gen_usedep 'python2_7')] - sci-libs/scipy[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/xlrd[$(python_gen_usedep 'python2*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - sci-libs/scikits_timeseries[$(python_gen_usedep 'python2*')] - x11-misc/xclip ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND="${CDEPEND} - dev-python/numexpr[${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*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - ) - html? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - || ( dev-python/lxml[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] ) - ) - R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )" - -python_prepare_all() { - if use doc; then - # Prevent un-needed download during build - sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' \ - -e "s:^ 'statsmodels:# 'statsmodels:" \ - -e "s:^ 'python:# 'python:" \ - -e "s:^}:#}:" \ - -i doc/source/conf.py || die - fi - 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() { - # test can't survive py2.6, alternately patch to skip under unittest2 - if [[ ${EPYTHON} == "python2.6" ]]; then - rm $(find "${BUILD_DIR}" -name test_array.py) || die - fi - cd "${BUILD_DIR}"/lib || die - PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \ - virtualmake || die -} - -python_install_all() { - if use doc; then - cd "${BUILD_DIR}"/lib || die - dohtml -r 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 - - if use examples; then - # example python modules not to be compressed - docompress -x /usr/share/doc/${PF}/examples - insinto /usr/share/doc/${PF} - doins -r "${S}"/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/pandas/pandas-0.13.0.ebuild b/dev-python/pandas/pandas-0.13.0.ebuild deleted file mode 100644 index 8175fe5c2b97..000000000000 --- a/dev-python/pandas/pandas-0.13.0.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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.13.0.ebuild,v 1.2 2014/01/22 13:41:41 jlec Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - -inherit distutils-r1 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" - -REQUIRED_USE=" - excel? ( !python_targets_python3_2 ) - doc? ( !python_targets_python3_2 ) - R? ( !python_targets_python3_2 ) -" - -CDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-dateutil[${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/pytables[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[$(python_gen_usedep 'python2_7')] - sci-libs/scipy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[$(python_gen_usedep 'python2*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - sci-libs/scikits_timeseries[$(python_gen_usedep 'python2*')] - x11-misc/xclip - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND="${CDEPEND} - dev-python/numexpr[${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*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - ) - html? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - || ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] ) - ) - R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )" - -python_prepare_all() { - if use doc; then - # Prevent un-needed download during build - sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' \ - -e "s:^ 'statsmodels:# 'statsmodels:" \ - -e "s:^ 'python:# 'python:" \ - -e "s:^}:#}:" \ - -i doc/source/conf.py || die - fi - 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() { - # test can't survive py2.6, alternately patch to skip under unittest2 - if [[ ${EPYTHON} == "python2.6" ]]; then - rm $(find "${BUILD_DIR}" -name test_array.py) || die - fi - cd "${BUILD_DIR}"/lib || die - PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \ - virtualmake || die -} - -python_install_all() { - if use doc; then - dohtml -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 - - if use examples; then - # example python modules not to be compressed - docompress -x /usr/share/doc/${PF}/examples - insinto /usr/share/doc/${PF} - doins -r "${S}"/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/pandas/pandas-0.13.1.ebuild b/dev-python/pandas/pandas-0.13.1.ebuild deleted file mode 100644 index 5cedd7552f8b..000000000000 --- a/dev-python/pandas/pandas-0.13.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# 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.13.1.ebuild,v 1.2 2014/06/24 00:37:17 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) - -inherit distutils-r1 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" - -REQUIRED_USE=" - excel? ( !python_targets_python3_2 ) - doc? ( !python_targets_python3_2 ) - R? ( !python_targets_python3_2 ) -" - -CDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/python-dateutil[${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/pytables[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[$(python_gen_usedep 'python2_7')] - sci-libs/scipy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - dev-python/xlrd[$(python_gen_usedep 'python2*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - sci-libs/scikits_timeseries[$(python_gen_usedep 'python2*')] - x11-misc/xclip - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND="${CDEPEND} - dev-python/numexpr[${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*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - ) - html? ( - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - || ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] ) - ) - R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )" - -PATCHES=( - "${FILESDIR}"/${P}-backport-test-fix.patch -) - -python_prepare_all() { - if use doc; then - # Prevent un-needed download during build - sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' \ - -e "s:^ 'statsmodels:# 'statsmodels:" \ - -e "s:^ 'python:# 'python:" \ - -e "s:^}:#}:" \ - -i doc/source/conf.py || die - fi - 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() { - # test can't survive py2.6, alternately patch to skip under unittest2 - if [[ ${EPYTHON} == "python2.6" ]]; then - rm $(find "${BUILD_DIR}" -name test_array.py) || die - fi - cd "${BUILD_DIR}"/lib || die - PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \ - virtualmake || die -} - -python_install_all() { - if use doc; then - dohtml -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 - - if use examples; then - # example python modules not to be compressed - docompress -x /usr/share/doc/${PF}/examples - insinto /usr/share/doc/${PF} - doins -r "${S}"/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/pandas/pandas-0.15.0.ebuild b/dev-python/pandas/pandas-0.15.0.ebuild index b6072e53d05c..f1f2cfa47a55 100644 --- a/dev-python/pandas/pandas-0.15.0.ebuild +++ b/dev-python/pandas/pandas-0.15.0.ebuild @@ -1,12 +1,12 @@ # 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.1 2014/10/26 19:41:19 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.0.ebuild,v 1.2 2014/12/07 16:57:02 jlec Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) -inherit distutils-r1 virtualx flag-o-matic +inherit distutils-r1 flag-o-matic virtualx DESCRIPTION="Powerful data structures for data analysis and statistics" HOMEPAGE="http://pandas.sourceforge.net/" @@ -17,9 +17,20 @@ 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_USEDEP}] + =dev-python/python-gflags[${PYTHON_USEDEP}] + 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/python-dateutil-2.0[${PYTHON_USEDEP}] + !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]" DEPEND="${CDEPEND} doc? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] @@ -38,7 +49,12 @@ DEPEND="${CDEPEND} dev-python/xlwt[$(python_gen_usedep 'python2_7')] x11-misc/xclip ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + 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} @@ -61,6 +77,10 @@ RDEPEND="${CDEPEND} ) R? ( dev-python/rpy[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/${P}-backport-GH8587.patch +) + python_prepare_all() { if use doc; then # Prevent un-needed download during build @@ -101,9 +121,9 @@ src_test() { python_test() { pushd "${BUILD_DIR}"/lib > /dev/null + VIRTUALX_COMMAND="nosetests" PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - nosetests --verbosity=3 -A 'not network and not disabled' pandas \ - || die "Tests failed under ${EPYTHON}" + virtualmake --verbosity=3 -A 'not network and not disabled' pandas popd > /dev/null } @@ -118,3 +138,11 @@ python_install_all() { use examples && local EXAMPLES=( examples/. ) distutils-r1_python_install_all } + +pkg_postinst() { + local x + elog "Additional funtionality following packages can be installed:" + for x in ${EXTRA_DEPEND}; do + optfeature "" ${x} + done +} diff --git a/dev-python/pandas/pandas-0.14.1.ebuild b/dev-python/pandas/pandas-0.15.1.ebuild similarity index 67% rename from dev-python/pandas/pandas-0.14.1.ebuild rename to dev-python/pandas/pandas-0.15.1.ebuild index 9459fc034821..61a705d90e94 100644 --- a/dev-python/pandas/pandas-0.14.1.ebuild +++ b/dev-python/pandas/pandas-0.15.1.ebuild @@ -1,12 +1,12 @@ # 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.14.1.ebuild,v 1.3 2014/08/15 14:32:57 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.1.ebuild,v 1.1 2014/12/07 16:57:02 jlec Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) -inherit distutils-r1 virtualx flag-o-matic +inherit distutils-r1 flag-o-matic virtualx DESCRIPTION="Powerful data structures for data analysis and statistics" HOMEPAGE="http://pandas.sourceforge.net/" @@ -17,14 +17,20 @@ LICENSE="BSD" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples excel html test R" -REQUIRED_USE=" - excel? ( !python_targets_python3_2 ) - doc? ( !python_targets_python3_2 ) - R? ( !python_targets_python3_2 )" - +_EXTRA_DEPEND=" + >=dev-python/google-api-python-client-1.2.0[${PYTHON_USEDEP}] + =dev-python/python-gflags[${PYTHON_USEDEP}] + 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[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]" + >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}] @@ -34,21 +40,25 @@ DEPEND="${CDEPEND} dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] =dev-python/pytables-3.0.0[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[$(python_gen_usedep 'python2_7')] + 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')] - sci-libs/scikits_timeseries[$(python_gen_usedep 'python2_7')] x11-misc/xclip ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + 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[${PYTHON_USEDEP}] + >=dev-python/numexpr-2.1[${PYTHON_USEDEP}] dev-python/bottleneck[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/pytables[${PYTHON_USEDEP}] @@ -65,7 +75,11 @@ RDEPEND="${CDEPEND} dev-python/lxml[${PYTHON_USEDEP}] dev-python/html5lib[${PYTHON_USEDEP}] ) ) - R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )" + R? ( dev-python/rpy[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}"/${P}-skip-tz-test.patch +) python_prepare_all() { if use doc; then @@ -86,7 +100,7 @@ python_compile_all() { fi } -python_compile() { +_python_compile() { # https://github.com/pydata/pandas/issues/8033 if ! python_is_python3; then local CFLAGS=${CFLAGS} @@ -107,15 +121,15 @@ src_test() { python_test() { pushd "${BUILD_DIR}"/lib > /dev/null + VIRTUALX_COMMAND="nosetests" PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - nosetests --verbosity=3 -A 'not network and not disabled' pandas \ - || die "Tests failed under ${EPYTHON}" + virtualmake --verbosity=3 -A 'not network and not disabled' pandas popd > /dev/null } python_install_all() { if use doc; then - dohtml -r "${BUILD_DIR}"/lib/doc/build/html/ + 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" @@ -124,3 +138,11 @@ python_install_all() { use examples && local EXAMPLES=( examples/. ) distutils-r1_python_install_all } + +pkg_postinst() { + local x + elog "Additional funtionality following packages can be installed:" + for x in ${EXTRA_DEPEND}; do + optfeature "" ${x} + done +} diff --git a/dev-python/pandas/pandas-0.14.0.ebuild b/dev-python/pandas/pandas-9999.ebuild similarity index 58% rename from dev-python/pandas/pandas-0.14.0.ebuild rename to dev-python/pandas/pandas-9999.ebuild index 935840ab6e05..c1ca3925cd9c 100644 --- a/dev-python/pandas/pandas-0.14.0.ebuild +++ b/dev-python/pandas/pandas-9999.ebuild @@ -1,30 +1,37 @@ # 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.14.0.ebuild,v 1.4 2014/08/14 15:30:09 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-9999.ebuild,v 1.1 2014/12/07 16:57:02 jlec Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) -inherit distutils-r1 virtualx flag-o-matic +inherit distutils-r1 flag-o-matic git-r3 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" +SRC_URI="" +EGIT_REPO_URI="https://github.com/pydata/pandas.git" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="" IUSE="doc examples excel html test R" -REQUIRED_USE=" - excel? ( !python_targets_python3_2 ) - doc? ( !python_targets_python3_2 ) - R? ( !python_targets_python3_2 )" - +_EXTRA_DEPEND=" + >=dev-python/google-api-python-client-1.2.0[${PYTHON_USEDEP}] + =dev-python/python-gflags[${PYTHON_USEDEP}] + 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[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]" + >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}] @@ -34,21 +41,25 @@ DEPEND="${CDEPEND} dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] =dev-python/pytables-3.0.0[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[$(python_gen_usedep 'python2_7')] + 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*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] - sci-libs/scikits_timeseries[$(python_gen_usedep 'python2*')] + dev-python/xlrd[$(python_gen_usedep 'python2_7')] + dev-python/xlwt[$(python_gen_usedep 'python2_7')] x11-misc/xclip ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + 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[${PYTHON_USEDEP}] + >=dev-python/numexpr-2.1[${PYTHON_USEDEP}] dev-python/bottleneck[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/pytables[${PYTHON_USEDEP}] @@ -56,8 +67,8 @@ RDEPEND="${CDEPEND} sci-libs/scipy[${PYTHON_USEDEP}] excel? ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - dev-python/xlrd[$(python_gen_usedep 'python2*')] - dev-python/xlwt[$(python_gen_usedep 'python2*')] + dev-python/xlrd[$(python_gen_usedep 'python2_7')] + dev-python/xlwt[$(python_gen_usedep 'python2_7')] ) html? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] @@ -65,7 +76,7 @@ RDEPEND="${CDEPEND} dev-python/lxml[${PYTHON_USEDEP}] dev-python/html5lib[${PYTHON_USEDEP}] ) ) - R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )" + R? ( dev-python/rpy[${PYTHON_USEDEP}] )" python_prepare_all() { if use doc; then @@ -86,10 +97,15 @@ python_compile_all() { fi } -python_compile() { +_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 @@ -102,15 +118,15 @@ src_test() { python_test() { pushd "${BUILD_DIR}"/lib > /dev/null + VIRTUALX_COMMAND="nosetests" PYTHONPATH=. MPLCONFIGDIR=. HOME=. \ - VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \ - virtualmake || die + virtualmake --verbosity=3 -A 'not network and not disabled' pandas popd > /dev/null } python_install_all() { if use doc; then - dohtml -r "${BUILD_DIR}"/lib/doc/build/html/ + 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" @@ -119,3 +135,11 @@ python_install_all() { use examples && local EXAMPLES=( examples/. ) distutils-r1_python_install_all } + +pkg_postinst() { + local x + elog "Additional funtionality following packages can be installed:" + for x in ${EXTRA_DEPEND}; do + optfeature "" ${x} + done +} -- 2.26.2