| 1 |
commit: 7c53949742780e1d490029b6702812e43200bc2a |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 18 20:40:12 2018 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 18 21:21:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c539497 |
| 7 |
|
| 8 |
x11-wm/qtile: version bump to 0.12.0 |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/616914 |
| 11 |
|
| 12 |
x11-wm/qtile/Manifest | 1 + |
| 13 |
x11-wm/qtile/files/qtile-0.12.0-tests.patch | 15 +++++++++++++++ |
| 14 |
.../qtile/{qtile-9999.ebuild => qtile-0.12.0.ebuild} | 18 ++++++++++++++---- |
| 15 |
x11-wm/qtile/qtile-9999.ebuild | 18 ++++++++++++++---- |
| 16 |
4 files changed, 44 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest |
| 19 |
index 1289b157f85..63002bfde7a 100644 |
| 20 |
--- a/x11-wm/qtile/Manifest |
| 21 |
+++ b/x11-wm/qtile/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST qtile-0.10.5.tar.gz 325311 BLAKE2B fadf8c232d6f3840f93d61d4c8c6a2dddc61483e316b02f7a60058eac0e5da9f3b2eab99e952b7db30e29036d2db0283e07926ec054322994ebaf16a7a223906 SHA512 00fbeaa17921eb2d4014c979bcd1f81f22e155606b13340f4653c262d7fde3b1f471a7f20e9a80b58435bdc1e5479c983a72e4be180b49df2ef4a5fe568b8631 |
| 24 |
DIST qtile-0.10.6.tar.gz 328892 BLAKE2B 3a4887808b87b0cbe4410d2bac8af4664873d2aa9b8c782f8c026ae78ba586b6e02d9a50ee42434afa916e9fe9041a7a15a68f9026ee7d95a0edec2594515cfa SHA512 39eef26358e1220ca766b030733396206df68677e3f23d6847d375f479952a4e2d47e0c3e59fab2e5046e899bad91d107a913bb25458fb66859dec3fa8c0e956 |
| 25 |
+DIST qtile-0.12.0.tar.gz 447139 BLAKE2B c1bea9ba8b36ccf14b7e55b4a2cbc05714ecffef33d992e9bf1683e6f8c416d481cf9d141bbf0fe62df65aeb3555290647d072dd45f507b08e0d523f992a1671 SHA512 a94237c40775524e16aebdd8555d0ed0623c248b65aee32851145e8a6cc54ce4d46ee5cf4c4f583e468de4557a565c4281660219e4b2ee1b73fb483567e1a5b2 |
| 26 |
|
| 27 |
diff --git a/x11-wm/qtile/files/qtile-0.12.0-tests.patch b/x11-wm/qtile/files/qtile-0.12.0-tests.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..8443381b176 |
| 30 |
--- /dev/null |
| 31 |
+++ b/x11-wm/qtile/files/qtile-0.12.0-tests.patch |
| 32 |
@@ -0,0 +1,15 @@ |
| 33 |
+The '~' character doesn't expand to $HOME in all build envs. |
| 34 |
+ |
| 35 |
+--- qtile-0.12.0/test/test_bar.py |
| 36 |
++++ qtile-0.12.0/test/test_bar.py |
| 37 |
+@@ -105,8 +105,8 @@ |
| 38 |
+ assert c.complete("/bi") == "/bin/" |
| 39 |
+ c.reset() |
| 40 |
+ assert c.complete("/bin") != "/bin/" |
| 41 |
+- c.reset() |
| 42 |
+- assert c.complete("~") != "~" |
| 43 |
++ #c.reset() |
| 44 |
++ #assert c.complete("~") != "~" |
| 45 |
+ |
| 46 |
+ c.reset() |
| 47 |
+ s = "thisisatotallynonexistantpathforsure" |
| 48 |
|
| 49 |
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-0.12.0.ebuild |
| 50 |
similarity index 70% |
| 51 |
copy from x11-wm/qtile/qtile-9999.ebuild |
| 52 |
copy to x11-wm/qtile/qtile-0.12.0.ebuild |
| 53 |
index fc96c05526e..5ba9a093204 100644 |
| 54 |
--- a/x11-wm/qtile/qtile-9999.ebuild |
| 55 |
+++ b/x11-wm/qtile/qtile-0.12.0.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2016 Gentoo Foundation |
| 58 |
+# Copyright 1999-2018 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
EAPI=6 |
| 62 |
@@ -34,15 +34,25 @@ RDEPEND=" |
| 63 |
" |
| 64 |
DEPEND="${RDEPEND} |
| 65 |
test? ( |
| 66 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 67 |
- x11-base/xorg-server[kdrive] |
| 68 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
| 69 |
+ dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 70 |
+ dev-python/xvfbwrapper[${PYTHON_USEDEP}] |
| 71 |
+ x11-base/xorg-server[xephyr] |
| 72 |
+ x11-apps/xeyes |
| 73 |
+ x11-apps/xcalc |
| 74 |
+ x11-apps/xclock |
| 75 |
) |
| 76 |
" |
| 77 |
|
| 78 |
+# display retry backoff slowness and failures |
| 79 |
RESTRICT="test" |
| 80 |
|
| 81 |
+PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch ) |
| 82 |
+ |
| 83 |
python_test() { |
| 84 |
- VIRTUALX_COMMAND="nosetests" virtualmake |
| 85 |
+ # force usage of built module |
| 86 |
+ rm -rf "${S}"/libqtile || die |
| 87 |
+ PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}" |
| 88 |
} |
| 89 |
|
| 90 |
python_install_all() { |
| 91 |
|
| 92 |
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild |
| 93 |
index fc96c05526e..5ba9a093204 100644 |
| 94 |
--- a/x11-wm/qtile/qtile-9999.ebuild |
| 95 |
+++ b/x11-wm/qtile/qtile-9999.ebuild |
| 96 |
@@ -1,4 +1,4 @@ |
| 97 |
-# Copyright 1999-2016 Gentoo Foundation |
| 98 |
+# Copyright 1999-2018 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
|
| 101 |
EAPI=6 |
| 102 |
@@ -34,15 +34,25 @@ RDEPEND=" |
| 103 |
" |
| 104 |
DEPEND="${RDEPEND} |
| 105 |
test? ( |
| 106 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 107 |
- x11-base/xorg-server[kdrive] |
| 108 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
| 109 |
+ dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 110 |
+ dev-python/xvfbwrapper[${PYTHON_USEDEP}] |
| 111 |
+ x11-base/xorg-server[xephyr] |
| 112 |
+ x11-apps/xeyes |
| 113 |
+ x11-apps/xcalc |
| 114 |
+ x11-apps/xclock |
| 115 |
) |
| 116 |
" |
| 117 |
|
| 118 |
+# display retry backoff slowness and failures |
| 119 |
RESTRICT="test" |
| 120 |
|
| 121 |
+PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch ) |
| 122 |
+ |
| 123 |
python_test() { |
| 124 |
- VIRTUALX_COMMAND="nosetests" virtualmake |
| 125 |
+ # force usage of built module |
| 126 |
+ rm -rf "${S}"/libqtile || die |
| 127 |
+ PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}" |
| 128 |
} |
| 129 |
|
| 130 |
python_install_all() { |
Archives