projects / wtk-overlay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc9468d)
webtest-*.ebuild: Install lint3 for Python 3
authorW. Trevor King <wking@tremily.us>
Wed, 8 Oct 2014 15:17:09 +0000 (08:17 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 8 Oct 2014 15:21:51 +0000 (08:21 -0700)
As I reported in Gentoo's #524724 [1]:

  $ docker run --rm -i -t wking/gentoo-portage:20140911 /bin/bash
  # emerge -av dev-python/webtest
  # python3.3 -c 'import webtest'
  Traceback (most recent call last):
    File "<string>", line 1, in <module>
    File "/usr/lib64/python3.3/site-packages/webtest/__init__.py", line 11, in <module>
      from webtest.app import TestApp
    File "/usr/lib64/python3.3/site-packages/webtest/app.py", line 41, in <module>
      from webtest import lint3 as lint
  ImportError: cannot import name lint3

I've also trimmed the Manifest, because my overlay uses thin, unsigned
manifests.  Feel free to re-thicken if you prefer.

I've also skipped the ChangeLog entry, because folks can just look at
this commit message.  Feel free to extract a ChangeLog entry from this
if you prefer.

[1]: https://bugs.gentoo.org/show_bug.cgi?id=524724

Manifest patch | blob | history
webtest-1.3.3-r1.ebuild patch | blob | history
webtest-1.4.3-r1.ebuild patch | blob | history
webtest-1.4.3.ebuild patch | blob | history
webtest-2.0.11.ebuild patch | blob | history

diff --git a/Manifest b/Manifest
index f2528d77f33424c51413e80714ff41ca6db1bea9..2f55c4391d335dd0c3b2ffe16df329254d1366a7 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,22 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX webtest-1.3-doctest-ellipsis.patch 1116 SHA256 a6e64a000ad6745b12cb8ab6061b09ce692f3efcf061851cc1bc0e4eb9d2e9ed SHA512 d1a8c2f7446862327e5a23a34fba81a737526d66e44c25753066aaf7f5145e2676b612ee7d9541d756683f96395d2805df90066038595365b34320e357544149 WHIRLPOOL d64d9d1edddf578f19d1aee3f8b3bad501b4a88dc2f5e06290b63a2189c7e3fc16968ba2185c7ca21920e89277fb905a982bfa897b19f59eb498cef1442fcd54
-AUX webtest-1.3.4-index_fixt.patch 325 SHA256 358939de8a5f188262c8ba337c122a390b408d2b56ae1f4c7c79875945ad6bc1 SHA512 fcf73ed79bc2028b05f84186592b8fc5bba385bef01d61a918757f24944a275c1a0bb189bccd2541b27fee160280bf51ba0982e28b62493d4f4522f4e6e52d16 WHIRLPOOL 205f68ffa89bcc037bee4b7d148acf5f51d4f0f760b0f4a062eed8cf9a85f50d36becafdcc77e02435b2f254cfddf3156faa0743a0dd4cc59aa0e8a81c56c4f0
-AUX webtest-1.4.3-doctest.patch 588 SHA256 13ada2315d4dce7a43d5364b73e923bbe85b56fe065d0f20e0893f7fdf5e6b95 SHA512 4479d86f15051f43a6d2d13f5e119446d2d8178efd5394335724260ba3d2a60817877976e4c62454f173e1c0052341f8aea2d49ce829059668295bdd76b204fb WHIRLPOOL 5493ca37b234850ec7800e0ad80ac6df7a68d030b4aa0d9d8cd3f031866ad0bb32d84778c4107e8e933eeded5c169c8ba8c19fda783b7f6fe5b74aa83959802c
 DIST WebTest-1.3.3.tar.gz 77709 SHA256 018897fd56c1f96396282ac36d32f5c7862eb07e3965765f0e86ca092ecd42a0 SHA512 879bb26302d074aba8b5c5534ff52180db3c7bcf57c08e6f20814a2e7626da8a9c37565558e2c151aa6ca2dbcfa5166a659ddb85d99e1e8f632da0a0cb07dba5 WHIRLPOOL e54a19dfe18a17617866472674246d12f23ed139a686cc1f83f1454c1478d4d1046b48b2fcf49fdd944d5de91c91423517456ff981cb726481837c9765aa65dd
 DIST WebTest-1.4.3.zip 80008 SHA256 0439d951afdf6c58d19e0a83e30855d0bb7e35ab177d9261add71fc5a724b6ab SHA512 87436f182edc3178481f4ec3d073399784e353d6480790470891a18d3605c2bb5a1f4effe0ffa0ce241f1256e99f1a4e3e5fcd2896acb8931aeb60a88fa2bfa2 WHIRLPOOL e509a71a213b9085473536afb51142c4cd9fe99b52870139498fe5b68e8326e8b23df9af3502f0d3ebffbe0076165564d38ef143d9b229bb94b23bb857ca6fe9
 DIST WebTest-2.0.11.zip 83073 SHA256 f196d3621746562f89c36c7167bf7c28428d362d2b597779922aa09d34339527 SHA512 6568728920220c9f0e7005bbadd32321da347eda8941c2611c2a0218de3feb617f5b7acafc74443100ae33bf56dae140bbeee9538a9778397342fffa8dfcd3e9 WHIRLPOOL d01d9ece5d3632141bad4f9840746612f37cdf719dbfea9966e32a51edd19dcc4bf6c689676d5767c6f899376be979c929cf10dfc7f216ace020f13c2e7ebf24
-EBUILD webtest-1.3.3-r1.ebuild 1761 SHA256 0fac3213a2c9daf3e56f0ad9382cfac3a47b7422cc8e3c586530dbe298632e67 SHA512 4434059945dc22fa1ed6fc62adc708fe9e277f7305d1f0772f3c7deeee320c9f2baa2bd7db7d8f771c04563e9811c1474a801ec23754c06c5ff3e0176289b236 WHIRLPOOL 2a5ef4e591f540a7eca679ace124d8095fc60ee5f7dd1e81f6e29cb4800d168aedb2417525201efc64314be74643326a34d7117d33d64dcf9c4d842004bcf3cb
-EBUILD webtest-1.4.3-r1.ebuild 1598 SHA256 e77c3b9e1e6763292fcabbfbb3e580a63ae4ef1e6dd298ac2bafd7bc184019ff SHA512 97d5fe67e6d8887a07716d95930777c523af49a3399a1d7364b59b8584f31248735a5f6238b72d3ff2277884a716b53f8380c0b6a1c09f5f4ac6c25ceb478fa5 WHIRLPOOL bf0c708a0e0531dbf771c2d39f75488f6fa18c8da2af9d540892596cf2f5da873edb465028128ad2bf860d1d1f2b1d4cb2a94c5304453afb91e4e17b443be6c8
-EBUILD webtest-1.4.3.ebuild 1384 SHA256 ee764eddae519a886ef53be93deccfbbc9664dd3f3d26893aa777cf0a1fdf844 SHA512 2e67653e129859628303a5962080f49a21ab4f2fd6e35dd585106992c7bcc5d4ecc51d674d086972c02b82e8fab23e111ec7bcc9c901c84122b32042accb6ff4 WHIRLPOOL 615b2cdcd24086808cfa961efa2d79549f7e645a5d8db3dcff30e04715817b7079660883872add50052815273be2cd82ab47fba4fce5093b1ed958fddf187167
-EBUILD webtest-2.0.11.ebuild 1863 SHA256 42e1e93484e603187790f5a82a91bcd1236d87328be67232a0da43f1b48275fa SHA512 f7d25fb8f6cbdb5d04119602463f35c7d388cea4782ad2d6af904ae7da23e72a00ef9e261693a5bac3ebfcab0e862130c950c11337bae052b22c1a6694b226fa WHIRLPOOL 4d2e94ebf87a77239c087cf57f493212956f90f44627db17f8cdef5bb5a1df77bb4e1d129a86c9bb095a77d3fa52c728b11d6d770693a4ded42f69550ae2c4d5
-MISC ChangeLog 9916 SHA256 93c627d27ac75edc5bb292f33a07cc6c8f0d54384c83e5b3a7f93999c3a57e65 SHA512 7208d5109930ccbcc259390a909c9229ef89b7cc4208c4866de5493176104eca2f967440569a0a6e97a07499da5f74f063f38a62649b01e9162ea289696c73f2 WHIRLPOOL 4ba6e5881fe5538e464123c1e5fcf37fd7c661cc912ed1f2a2e70d4bd9a48695bbb0af4d9feaba59437cafe3402ba7cb614a552ecf3d877784d1bcf3fd207fdf
-MISC metadata.xml 230 SHA256 5b66abf10f340308f2e1a4f3a275e110a2a52842e683bd2a1eb84d387a5ea163 SHA512 d55a5077c6ece4bb2da3d869023175b49a9ff6f20aed4696ede22e729ef823c4d162911ed3fd85fe29973600813624e4d5d5d6d2a9c82395abe0090f76e673dd WHIRLPOOL 726f7c4456a23191c433f978002121826d71729ad750a862a80229b828ebe6d2d2410ad2a87229380608d9880e38c21c441a778963d38c7ad3a646c66f2eed35
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlLasjQACgkQC77qH+pIQ6T12wD8D2V7UH3L4rAMogPNUGc/1nSi
-zfkZfBouPI/88/HWX48A/0kjEmyOowAsrlN6nqhH1Ep8iCKRYmu7WcVIQ9hgFmc4
-=blxt
------END PGP SIGNATURE-----
diff --git a/webtest-1.3.3-r1.ebuild b/webtest-1.3.3-r1.ebuild
index 9f5ebe996a4473bfdc7fdbcdadf3fb862b29286c..f869e0517c553ca104e74586f411f993625fb629 100644 (file)
--- a/webtest-1.3.3-r1.ebuild
+++ b/webtest-1.3.3-r1.ebuild
@@ -54,14 +54,6 @@ python_test() {
 python_install() {
        distutils-r1_python_install_all
 
-       # Avoid future-import bug on py2.5.* - lint3 is py3 anyway
-       #removing since we don't support python 2.5 :D
-       #delete_lint3() {
-       #       [[ "${PYTHON_ABI}" == 3.* ]] && return
-       #       rm "${ED}$(python_get_sitedir)/webtest/lint3.py"
-       #}
-       #python-r1_execute_function -q delete_lint3
-
        if use doc; then
                dohtml -r html/*
        fi
diff --git a/webtest-1.4.3-r1.ebuild b/webtest-1.4.3-r1.ebuild
index c86c056fcaa97d149f7892e6677524903596bfbb..0799644801144a34b557da5902c7b52bd1f2655c 100644 (file)
--- a/webtest-1.4.3-r1.ebuild
+++ b/webtest-1.4.3-r1.ebuild
@@ -49,14 +49,6 @@ python_test() {
        nosetests || die "Tests fail with ${EPYTHON}"
 }
 
-python_install() {
-       distutils-r1_python_install
-
-       if [[ ${EPYTHON} == python3* ]]; then
-               rm -f "${D}$(python_get_sitedir)"/webtest/lint3.py
-       fi
-}
-
 python_install_all() {
        use doc && local HTML_DOCS=( html/. )
        distutils-r1_python_install_all
diff --git a/webtest-1.4.3.ebuild b/webtest-1.4.3.ebuild
index 3e2a30fc9c08eb579e75dc8dd28b171c611a2daf..eb7fd42b0655e40c802604db13dc227e5e17f1f4 100644 (file)
--- a/webtest-1.4.3.ebuild
+++ b/webtest-1.4.3.ebuild
@@ -44,13 +44,6 @@ src_compile() {
 src_install() {
        distutils_src_install
 
-       # Avoid future-import bug on py2.5.* - lint3 is py3 anyway
-       delete_lint3() {
-               [[ "${PYTHON_ABI}" == 3.* ]] && return
-               rm "${ED}$(python_get_sitedir)/webtest/lint3.py"
-       }
-       python_execute_function -q delete_lint3
-
        if use doc; then
                dohtml -r html/*
        fi
diff --git a/webtest-2.0.11.ebuild b/webtest-2.0.11.ebuild
index c28b7db3ca55a8c4c790da6e5f764e98855ec9b9..69bdc53c990f2de1d0e54717b54d8c0a2b49302f 100644 (file)
--- a/webtest-2.0.11.ebuild
+++ b/webtest-2.0.11.ebuild
@@ -59,15 +59,6 @@ python_test() {
        nosetests || die "Tests fail with ${EPYTHON}"
 }
 
-python_install() {
-       distutils-r1_python_install
-
-       # Why is it so?
-       if [[ ${EPYTHON} == python3* ]]; then
-               rm -f "${D}$(python_get_sitedir)"/webtest/lint3.py
-       fi
-}
-
 python_install_all() {
        use doc && local HTML_DOCS=( html/. )
        distutils-r1_python_install_all
W. Trevor King's Gentoo overlay.