diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2013-05-28 18:25:05 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2013-05-28 18:25:05 +0000 |
| commit | c6eaaa33da75479f7d85dec8197f09fc35d27126 (patch) | |
| tree | 77cb8018dd57d31e4ed990af531aba5e8ed636e1 /dev-python/pymongo | |
| parent | Mask >=sci-libs/clipper-2.2 for new for new version schema (diff) | |
| download | historical-c6eaaa33da75479f7d85dec8197f09fc35d27126.tar.gz historical-c6eaaa33da75479f7d85dec8197f09fc35d27126.tar.bz2 historical-c6eaaa33da75479f7d85dec8197f09fc35d27126.zip | |
patch to fix test in py2
Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D
Diffstat (limited to 'dev-python/pymongo')
| -rw-r--r-- | dev-python/pymongo/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pymongo/Manifest | 11 | ||||
| -rw-r--r-- | dev-python/pymongo/files/pymongo-2.5.1-greenlet.patch | 17 | ||||
| -rw-r--r-- | dev-python/pymongo/pymongo-2.5.1.ebuild | 7 |
4 files changed, 31 insertions, 10 deletions
diff --git a/dev-python/pymongo/ChangeLog b/dev-python/pymongo/ChangeLog index 163c0c70f5d3..f6689bf28327 100644 --- a/dev-python/pymongo/ChangeLog +++ b/dev-python/pymongo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pymongo # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/ChangeLog,v 1.25 2013/05/27 07:49:42 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/ChangeLog,v 1.26 2013/05/28 18:24:32 idella4 Exp $ + + 28 May 2013; Ian Delaney <idella4@gentoo.org> + +files/pymongo-2.5.1-greenlet.patch, pymongo-2.5.1.ebuild, pymongo-2.5.ebuild: + patch to fix test in py2 27 May 2013; Ian Delaney <idella4@gentoo.org> pymongo-2.5.1.ebuild, pymongo-2.5.ebuild: diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest index a6f72b225901..ca3cb5d67b31 100644 --- a/dev-python/pymongo/Manifest +++ b/dev-python/pymongo/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX pymongo-2.5.1-greenlet.patch 673 SHA256 c3a0822fbb8892288bda09e0ab54a88d0d5da7aba4f641b64b930e5e790a1fee SHA512 6605a29a483d700fe8a41f3e70a6df41c0e28098e5e9d5b3e74cbbedfc570bbb38bd12e98a588f2aa1bafacf9c02e7ec8a408a67c9312e322eac74b0b39b09b6 WHIRLPOOL 110a664739851b54621cb588e1b5e4a37fe50bb0e583dccd04f58971f55467ccb652f9105eda234098ecade7cb6b0e8af0fa86255089cd4b403ddee62aa83d50 DIST pymongo-2.3.tar.gz 254199 SHA256 8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc SHA512 eb08f9716b2d5ee6c71ab06fe4e1ab57cb1385de808f26720a0173375be52a184dfabad23f7b10e765a7eb1b06fed597d27c052e7d42a60f7e470862abef8b25 WHIRLPOOL 25612002a891eb39d00416e0fbc0c64289bd307da11aef7bcd8f5763d12dec0c6495de7a62d24bc5518c50e7af3743724c1bc0c9a972872c420cca0c8f5881ae DIST pymongo-2.4.2.tar.gz 283269 SHA256 6862c85844f1766c261a39022ec7a6b631988cb5528a31f8d20e78181398aa5f SHA512 c29da74eecd1e75cd5649dad23d51e848e20d082fce5c5f620e46f257caa9044d821daaa2895bbdab79039fb29fa0ada9a244f8905bb9f0180bd714220e55f0f WHIRLPOOL 93111b01ec2635bd61a830b3287644994d916ae06b9eb09cc13fbb0ccda82ac5966be8f4f9283d03531ec8c1dc8736655b26e49a4ede96e68bfe1da12c6ff30b DIST pymongo-2.5.1.tar.gz 302926 SHA256 85949837c807b19af6c3972e311a6eaaae6b2b6e15daa1d207a296b8d2027d36 SHA512 63d42a56fbde704dd906c334b34740e10e3d1dc147835e1c528c7df61eec971b3510bf769a25dbf655375f96dbb88ebc31964d83547732e88259839d1452cdc1 WHIRLPOOL 9b0e8b8025a3fb9d61bb93b277ec6a78e5c2b19b82bcfa45025eea54ee068c15cbf0e0dacf2a3df3794215fa280582399edebe1d45aba56cfd431f87c57161c8 DIST pymongo-2.5.tar.gz 294930 SHA256 79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222 SHA512 f99adf2f9ccb4bb8c0bf098ae34663759336fbbdd24fda98dfd30133c9f0aea819243185430e247e09529cf31ef723739a75605d7ee534fe1db0f22af3afc19b WHIRLPOOL 24afd7a137b62ff6bc831c189658e42763a19d92632e2fbd633d57c79bb872191aae1de0841b821208e2d726b55a7762f8295bbdd96f4aaf95dc30fe4f758034 EBUILD pymongo-2.3.ebuild 1595 SHA256 c00c35360ba4d3136131833c87d91edaefee9e58ac61d08f237a6a2d598ffcf2 SHA512 dedd29e7f676cad30a5a805753a16548d8a1edab19ea3c59a004f33c05a218714f1c317f7db0b873bc4e6697f05e8c8e1e184e7a816fc2f98a704ff55759bf5b WHIRLPOOL e512901c958fe57df883ec4d00b6370c0b13384270ef9041a6b0fbe56f014ca7a41b1fd8f6fe7b1bb98eb6423760076cc6563773f37118110a6c090d8b0105a8 EBUILD pymongo-2.4.2-r1.ebuild 3080 SHA256 eebb37f40476c5f4e80d5597589ea6f20d760ad76dcf29d4e85a518e9bafe686 SHA512 29ddc1cedda9b3a443f7533fe93afe49385b81eedc568558dccb4c5db8a86f3aee07501a877babb2b5284581472a1b83bda6bee307fd49c65df1ea4102e2653a WHIRLPOOL 98134c95f61ee91751ac7b787b4528d792571f51c0f1475d714f73aee5c35ce0cb00558ec5a7c7d8eef249a1921b129bfd521ff46f6b43ffef9f69c9ae923321 -EBUILD pymongo-2.5.1.ebuild 3429 SHA256 3bb9194e018786f8ca17a662bd8080c811fec34b2ff04e98a34b4128b7a66af7 SHA512 3d25ea0d9da0eebc16252b9087f50ec6eb0e2c41cca5a4408cf8863855a01e82e405345f6017a4894a343ab5f271c21618bda9b789ce0da8806c15c79032fd00 WHIRLPOOL ffa39356ed30a55cc14634c0f7934c3fa9542abccf8bb4c05f0dcf76021520421e44651e23c92d50eb6a9bfe1ef3c442dea26fc1fc4945f01423a37e9dcf667b +EBUILD pymongo-2.5.1.ebuild 3317 SHA256 d74db004a79b1fe3090c1d9a1a1947640ad596a9514a46af4ff379e5c36b804d SHA512 3e3d2aadfef162345cc84d120d92ba4cc6591137ca10b15fd0a4f58ee0f70edfd6a5792cc686cb4900189beb87a322cf5c44c975019ef582ae6990cec18df02f WHIRLPOOL 2e93cc85ab84a254b5560d55cee69922e374e0661a5869c840c2172437f0670fae0adfbe57b6f68bee8c8c4d75977d17129320c44b6626d464ce986cb45c4dbd EBUILD pymongo-2.5.ebuild 3123 SHA256 ffecf3cf565d38784055cb3c2b7477eaf088b812b6984eebc33c1ba58f15967f SHA512 3cb6a0f6d5e9bbc6cd96a218f89bb29b80f076dc3c861df1c91e53b058278b44dd46475a901009519999ce920bc0784a162007574c2b99be666228ea3a68d1fe WHIRLPOOL 8e6df3799b4fa6deea0cce5b70ab2b84f5b7df5b0fc36dbc2147ec20dcef4e3e5084acd90f4e97fabd8054dd627a4630514f774966d9b4c2658ffb82958a7ab4 -MISC ChangeLog 4083 SHA256 84ef4a18d72343058d3c6698e330d3627dffb150d1aa126b7c9a13c53fd934df SHA512 e883c272bcec207ee9e17fcf533175671239254de19013edc55db8d0744c9c96f00843b666599cbb8569d8f9f02c2c8bacddb7a456ef61c2b47ee51d7dd87eb4 WHIRLPOOL 1b0935eb80483cef58e94ebf51810c60b4cb896eced5ff10d73266f77914dfc83536291e9d44f8639dfa9f7f04df167b4f853db1ef2a93d43ebb9e72e3a6147b +MISC ChangeLog 4240 SHA256 b36ffb8490db1ba9717cbb573a4d0e112dc2b501bb7a724d601a36ec6a0d1510 SHA512 e9e96215de6c220ba0627ea1b5f4d1403cdea08b474523146bb4f655559fa2b0a489f2eb198fbc98187e320134cce207bda46da2fbe5ab54c158734e4d477728 WHIRLPOOL d209e31114bd9d6361da8aaa67149ab1b3be4502a0fb9ff2a2140b9272134d92becc53c7d93dbc3439943ec5882a038e86813bc249145b2b4305a1e5890959a0 MISC metadata.xml 938 SHA256 727efde10e259e145e89f23269b52226b658ca5636f45997ab3450a623afe930 SHA512 8dba1e47b077267bda609ffd22b7526f7019c489722f7bfe32b47a24974756f531efa0258e65f2b45223cb7f1dc4d29489b5437c5d871cb0fa39de4c053377bb WHIRLPOOL c2bbf2195c841e2c0501801aa8c171fce707539dece8eba5e61e6edfdb5a5d5d11b1f7df54c7ff73493dcb3c821f52288d3aef8e6bdd9616a46218af5c25ca72 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGjEEMACgkQso7CE7gHKw3ASwCfUsWsx5i+Vl1cppHHmScNWlAa -SE8AnjY2VI758O+o0IL8giYUu0DQDSgr -=GGUj +iEYEAREIAAYFAlGk9nEACgkQso7CE7gHKw3B4wCfYyUeT7bL8jbPpl3/StNKdGwJ +OXwAn0fsXfIxsL9ZW+sFDIH+uDmuqzz6 +=x+Nf -----END PGP SIGNATURE----- diff --git a/dev-python/pymongo/files/pymongo-2.5.1-greenlet.patch b/dev-python/pymongo/files/pymongo-2.5.1-greenlet.patch new file mode 100644 index 000000000000..dde6228f3422 --- /dev/null +++ b/dev-python/pymongo/files/pymongo-2.5.1-greenlet.patch @@ -0,0 +1,17 @@ +https://github.com/mongodb/mongo-python-driver/commit/519733457fb456f64b49ae66ffa6a401e1e72f24 +diff --git a/test/test_pooling_base.py b/test/test_pooling_base.py +index 2190f38..d396b56 100644 +--- a/test/test_pooling_base.py ++++ b/test/test_pooling_base.py +@@ -700,6 +700,10 @@ def leak_request(): + g.start() + g.join(1) + self.assertTrue(g.ready(), "Greenlet is hung") ++ ++ # In Gevent after 0.13.8, join() returns before the Greenlet.link ++ # callback fires. Give it a moment to reclaim the socket. ++ gevent.sleep(0.1) + else: + lock = thread.allocate_lock() + lock.acquire() + diff --git a/dev-python/pymongo/pymongo-2.5.1.ebuild b/dev-python/pymongo/pymongo-2.5.1.ebuild index 59772b075451..70c9c0612011 100644 --- a/dev-python/pymongo/pymongo-2.5.1.ebuild +++ b/dev-python/pymongo/pymongo-2.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.5.1.ebuild,v 1.5 2013/05/27 07:49:42 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.5.1.ebuild,v 1.6 2013/05/28 18:24:32 idella4 Exp $ EAPI=5 @@ -42,6 +42,8 @@ pkg_setup() { reqcheck pkg_setup } +PATCHES=( "${FILESDIR}"/${P}-greenlet.patch ) + python_compile_all() { if use doc; then mkdir html || die @@ -105,9 +107,6 @@ python_test() { pushd "${BUILD_DIR}"/../ > /dev/null if [[ "${EPYTHON}" == python3* ]]; then 2to3 --no-diffs -w test - elif [[ "${EPYTHON}" == 'python2.7' || "${EPYTHON}" == 'python2.6' ]]; then - sed -e 's:test_socket_reclamation:_&:' \ - -i test/test_pooling_base.py || die fi DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1 |