diff options
| -rw-r--r-- | dev-python/traitsui/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/traitsui/Manifest | 11 | ||||
| -rw-r--r-- | dev-python/traitsui/files/traitsui-4.3.0-tests.patch | 34 | ||||
| -rw-r--r-- | dev-python/traitsui/traitsui-4.3.0-r1.ebuild | 12 |
4 files changed, 51 insertions, 13 deletions
diff --git a/dev-python/traitsui/ChangeLog b/dev-python/traitsui/ChangeLog index 1673c0762632..bbc674c615f1 100644 --- a/dev-python/traitsui/ChangeLog +++ b/dev-python/traitsui/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/traitsui # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/ChangeLog,v 1.7 2013/04/11 18:45:34 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/ChangeLog,v 1.8 2013/04/12 05:51:09 idella4 Exp $ + + 12 Apr 2013; Ian Delaney <idella4@gentoo.org> + +files/traitsui-4.3.0-tests.patch, traitsui-4.3.0-r1.ebuild: + test phase fixed again, upstream provided (an unexpected) fix in tracker + issues#74 *traitsui-4.3.0-r1 (11 Apr 2013) diff --git a/dev-python/traitsui/Manifest b/dev-python/traitsui/Manifest index 43c89cab2914..8f0e905e94ab 100644 --- a/dev-python/traitsui/Manifest +++ b/dev-python/traitsui/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX traitsui-4.3.0-tests.patch 1408 SHA256 913e3c0d8767f77bd53a6798bd074b1f4f9f9a5f75718da1cf206dae164f523f SHA512 1e7eb7e3f2fe0a07206833fa5114f3a75db0f2467dc1132d103199426b3e28a6b0aec607f81ce1108b9f34db9cdc1214421224d0a5559140c65e6de46d94ef26 WHIRLPOOL c736743f28d389a3d33497629e46bd8b1b00d8c6a09c7ede0648532e629cd4e9fb60a0fcf7c43cae656109f14e2bfef92f0ae44dc1d855d50431af1fa71a1ff4 DIST traitsui-4.0.1.tar.gz 6579406 SHA256 46b099c16af8a4dfcb55a595ea30f3a08daee007e43d3efb74081246130a35d7 SHA512 15306dc3021d17c813d98e2d4f3c526a3be0e76ca705da86eeb0d82a893660affea3a29f400e3ad8adf295b332b838402fb6f9fc54e9b659d132153009268c9e WHIRLPOOL 04a6d599e13ec3621c8dbe1738be3caa2e410f65632b47b82a5dd35ab3314550e4571abedef62f4aaf7571a60f2b225ded3a560c83f9c0469aac22b3cf371654 DIST traitsui-4.1.0.tar.gz 6689700 SHA256 2af8980fc4fef557283cbf591479923a1f975c3c4efdd4640f50682fee177e49 SHA512 7162ec7de5681d79d8ff0ae5149c6cd9524236c1dca1bb1b0a49a2b7a6d3ff5198044e0c5bff0229cb5fb0420d6296ec07d05607f42a7dbbfc6edff1216c2ad6 WHIRLPOOL 0971b75183b0437a6be1bfdb927afeef04e6b79bbacc472b5b05ae36dc805f02847a2400aed2336cdc5f8878857b5fe9072ced572b741926e84913ff301d6330 DIST traitsui-4.2.0.tar.gz 6698322 SHA256 029da46eff8e79d9123b1553bb0f4749bedfe691f1aa90465d84e167687e4ee7 SHA512 7a0c53783ac04a3b6edb7462033e8db458e19369966c5d8a4d76837fc5be99c4e6fc3582afe56a0050bb7c02cafc48797ab87a6ee8e55e7db4f6e664b296080c WHIRLPOOL dc4768df33d862e55fbdb3335139e713bc90396d6f5d5c69eb0ae1f8f0d9341ea20c435b376b7b90d2245b8967e11c69608f1d6c2e596cfa7e30c8fa1644b5cc @@ -8,14 +9,14 @@ DIST traitsui-4.3.0.tar.gz 6691338 SHA256 f5d3c41020f3caedf9b5dbdc12ba64704cdf72 EBUILD traitsui-4.0.1.ebuild 1516 SHA256 3d9ed323ee77f2813b03381ca6a1a2cd4e60bc2cda9d62a78eeb76e32b02263e SHA512 13543ab003d85a416921bf44b282857b254f8424053749297790abc60d7226e774394cf8d21475712f3dec6ef144ca06b80e888ef016d12e7f469ce36ad315f2 WHIRLPOOL c50a3dcc5cff6ec33be18a7f0faf8128a1f19ce74dda3f76d1b235a4641e89674fa699f095ee0585a75532b542f721f55eb2760a04807e6f726520904a736341 EBUILD traitsui-4.1.0.ebuild 1199 SHA256 e428e807e8f66363577b2d79c38a938e8a3dce0e453c2e9f83c6962aff12b8cf SHA512 122a8eaf0ecae3cf906cd72a7c3f65e951f29e96d11511a49dc295aacef96af8b927c298ea3f8393dbdec4671529b6669e7a893bd57ce449ffe7424c72fa04c0 WHIRLPOOL c35f3b31027457a1d363e69478783b2d31ee2fe441c732e1e32ce5322fd39f4cadd7da0d2b0dc06c6a15e91dd6d750d2838a792d23eea7d9987ce0977b0bed58 EBUILD traitsui-4.2.0.ebuild 1224 SHA256 b7d8b5a06cc1535a33425e82f3a5c039910beb12be3c147fbda53fb1cd122766 SHA512 efa792e7ce41cdce372f0fea8a21746791a42ffa529831a63b924c880d77296cf6cc55e83347a77a9a8805580ca6522d15e3045a1db9890ab208ac25bd00d2d5 WHIRLPOOL b3e0094f65bab91994d39da30a3171fb25d3f6bb2ad7b49a5a701a193011c853428ab0e54775bb96d723bea0ba8c06ff25feb4bf7d8a505162a43f27126e5676 -EBUILD traitsui-4.3.0-r1.ebuild 1588 SHA256 ff276b0d889bd0c2daa995a6f8058c8af01cb6d4fc8c933376c5496cd9aec959 SHA512 3b1a0d880f9e70b1bf0d4b78cd88e1a00b7e2b288f2c706d9dea484bcb431b2729dbcd447d533b99df94770c6e0f2c8b4f3dd7f1801d678045bb5914392bec58 WHIRLPOOL 9439b37cb4fcaa49833cc193c160e6fd1230ba65c5faa5d47dbc4a1ac5c91836523b2c5e14a498fdfd607e9fb9ac0995651c4f16a532c52813376ae4ed4f2d6b +EBUILD traitsui-4.3.0-r1.ebuild 1338 SHA256 cbefc347c34aa1059df3ccbde0443eb3db4568cbefae721df2261d6e03701026 SHA512 8423b41842da230e36e364b070c0059e3a63d0169aba833bffee7831151bb85678ee480b2585903647f2e6b6d153f27bf26e6439cb641a6896232b23e98af697 WHIRLPOOL 432d993ae9100f4f87308df8a36058312b7e2cc5e300d77449531ebbe0344c0b7a0cb3a1d2096b3627ebe18acfd125fb4034ef4d6dc248c4f8ad4072b2985528 EBUILD traitsui-4.3.0.ebuild 1223 SHA256 94c3cc2b98318ec2ca458be9a4bff75e5801e85978a9df860689a2c35306f7bb SHA512 9f105f97a461ceb303ede2ea93d84405557758cb0ffacb991f6f159519c26aa9d644e0ff4f940cdcb82b70a6a0ba12a25f30257a628024b4376832590d914089 WHIRLPOOL be73e56992dcabc3839a71724cc79f939ffb8d06737f50cbb8606d4655d92356c1fab9eb0e94cf548f8024452cadfc19eac44b1adb2e9e2755857808f773c309 -MISC ChangeLog 1099 SHA256 b631a1e6aa4c9ff5ce0d78f3419f2ba1731a385c1cdc7259a26c06d008219d5d SHA512 5028d63616fa8ecc75e4f083f52db9a3f3c3299d4be0adf0886109ada375ff077013a6bb2f55947c79838cc87a60d73e1a5e95bd9a7992008107cf9a53113f5f WHIRLPOOL b4bcbea1327654a3322c3ce8309932db1fce07c4e7c3ae553a4c05dbe82cb65877f231e2501effe8378d4b5417f1228e8b585f13f57314d275ee7bbf7b47e4bd +MISC ChangeLog 1298 SHA256 7678b5f84dddd34aa64be0155669ab70d17553f6a392434cb70122114ff125a6 SHA512 cb3df46ef3e321235bef3991835a03575163e5766883b4657e0ce792546487edf36f320ac112e4a9894a7475cc23821ae969e3dffe6ad86e02746ad0fddfbf5c WHIRLPOOL 73caff81faf627bb95fb57d1b3fc2e1ff8b07ca50629ffd636b21034822bc34717725b968357d42ed6e9bad6efa7dcca50e00fb1725e99e45971d94e8c3fa98f MISC metadata.xml 553 SHA256 a9b823871f61b5d0e15378e78eb4edfbb540acbe88553ca90ffd81500d40cbad SHA512 d8204d5dde82ce0b7da0e0be2a9abbcaa6da5604157152541a2656437c1f2f00dd88df60cc1aa8bb46425d174ec87166aa5095e52c8a1d8cb6b76ad83e0e2f12 WHIRLPOOL d44b16ea1dfb8d34dadb37a5993ac7f5ae8734564ed9b59c90f45c39e4f904e89edb0616630610c0363d80f7f1c9b370de065b754f65e15dc60a7ace23964eaf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlFnBNYACgkQso7CE7gHKw0dcgCfdKOfkvYrYRXU67ihqrzq/6k8 -ZEAAnRXKhdTLMANhBhqv7f0VnKdY39w/ -=qyBO +iEYEAREIAAYFAlFnoNUACgkQso7CE7gHKw3avQCfY7ABxqGWv6ut0NHwefYzWB1D +FRwAoJl3/hFdr0fn+Z6yhB+ltpkoX94F +=zHI7 -----END PGP SIGNATURE----- diff --git a/dev-python/traitsui/files/traitsui-4.3.0-tests.patch b/dev-python/traitsui/files/traitsui-4.3.0-tests.patch new file mode 100644 index 000000000000..2712203dfb57 --- /dev/null +++ b/dev-python/traitsui/files/traitsui-4.3.0-tests.patch @@ -0,0 +1,34 @@ +https://github.com/enthought/traitsui/issues/74 +diff -ur traitsui-4.3.0.orig/traitsui/qt4/ui_panel.py traitsui-4.3.0/traitsui/qt4/ui_panel.py +--- traitsui/qt4/ui_panel.py 2013-03-29 04:08:54.000000000 +0800 ++++ traitsui/qt4/ui_panel.py 2013-04-12 13:23:09.499989912 +0800 +@@ -977,7 +977,7 @@ + + if (label is not None + and not is_label_left +- and item_policy == QtGui.QSizePolicy.Policy.Minimum): ++ and item_policy == QtGui.QSizePolicy.Minimum): + # this item cannot be stretched horizontally, and the label + # exists and is on the right -> make label stretchable if necessary + +@@ -1012,7 +1012,7 @@ + label_policy = label.sizePolicy() + label_policy.setHorizontalStretch(stretch) + label_policy.setHorizontalPolicy( +- QtGui.QSizePolicy.Policy.Expanding) ++ QtGui.QSizePolicy.Expanding) + label.setSizePolicy(label_policy) + + +diff -ur traitsui-4.3.0.orig/traitsui/tests/_tools.py traitsui-4.3.0/traitsui/tests/_tools.py +--- traitsui/tests/_tools.py 2013-03-29 04:08:54.000000000 +0800 ++++ traitsui/tests/_tools.py 2013-04-12 13:23:09.502989914 +0800 +@@ -173,7 +173,7 @@ + return ui_control.GetSizeTuple() + + elif is_current_backend_qt4(): +- return ui_control.size().toTuple() ++ return ui_control.size().width(), ui_control.size().height() + + + # ######### Debug tools diff --git a/dev-python/traitsui/traitsui-4.3.0-r1.ebuild b/dev-python/traitsui/traitsui-4.3.0-r1.ebuild index 32bbd2b33441..8673c0193746 100644 --- a/dev-python/traitsui/traitsui-4.3.0-r1.ebuild +++ b/dev-python/traitsui/traitsui-4.3.0-r1.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/traitsui/traitsui-4.3.0-r1.ebuild,v 1.1 2013/04/11 18:45:34 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/traitsui-4.3.0-r1.ebuild,v 1.2 2013/04/12 05:51:09 idella4 Exp $ EAPI=5 @@ -29,19 +29,17 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] DOCS=( docs/traitsuidocreadme.txt ) +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) + python_compile_all() { use doc && emake -C docs html } python_test() { - # https://github.com/enthought/traitsui/issues/74; - # upstream can't be relied upon to fix, unpassable tests here excluded export ETS_TOOLKIT=qt4 export QT_API=pyqt - VIRTUALX_COMMAND="nosetests -e test_qt_show_labels_right_without_colon* \ - -e test_qt_labels_right_resizing_vertical* \ - -e test_visible_when_layout* \ - -e test_qt_labels_right_resizing_horizontal*" virtualmake + VIRTUALX_COMMAND="nosetests -v" virtualmake + } python_install_all() { |