commit:     b6d547eeeac2ffcf92fb483e15a9c0a07e1290b7
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 11:56:02 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 11:56:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d547ee

dev-python/{mccabe,flake8}: Version bump and fixes

This version of flake8 now depends on the recently-added pycodestyle.
Also, I changed the way the test suite is run to avoid a name collision.

 dev-python/flake8/Manifest            |  1 +
 dev-python/flake8/flake8-3.0.4.ebuild | 59 +++++++++++++++++++++++++++++++++++
 dev-python/mccabe/Manifest            |  1 +
 dev-python/mccabe/mccabe-0.5.2.ebuild | 31 ++++++++++++++++++
 4 files changed, 92 insertions(+)

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 94dd1f3..2436427 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -5,3 +5,4 @@ DIST flake8-2.4.1.tar.gz 50324 SHA256 
2e7ebbe59d8c85e626e36d99f0db2f578394313d3f
 DIST flake8-2.5.0.tar.gz 82600 SHA256 
8216c8c6ee092ae93d51f89bc91045648c88cd9be77d60cf47df7ca26ee4f88c SHA512 
6f55ae237fb834fa9376760eddf77553f9edb1b7328175c5f07232b160e4d5ea9d65caa91241f7d1db90845f9c02b8d41129cd453c1b09a4d6870e0e53ba0f8d
 WHIRLPOOL 
d08e5c2d2c488e558e02a272c1753defa2a200d37b2b113f1f1523dc06f6ee5dc7f37c60f598eff91c4aeb47a76bd0dd60c0fdd7d2a6b7fa0a7bbec2b60a88d2
 DIST flake8-2.5.1.tar.gz 83692 SHA256 
448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603 SHA512 
030d2464717f62e3c5501631e7bc4482321086ca3e7f7dfe845dab66aaf38be94565c1e147792ba7e7d2850fd5290e61a24fe1006daf18c3be2ff81348c5731c
 WHIRLPOOL 
63a6915eeb32be4aa51f3b69c5c6918c3a2953a4dff203515d20a10e58dc12cf7732a5e715b279c17d2a0e4b77f6879dc9f489395ddbcb6d0c340a21be39f9e4
 DIST flake8-2.5.4.tar.gz 81663 SHA256 
cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 
31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28
 WHIRLPOOL 
2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47
+DIST flake8-3.0.4.tar.gz 1382588 SHA256 
b4c210c998f07d6ff24325dd91fbc011f2c37bcd6bf576b188de01d8656e970d SHA512 
845b38824112edfc8244f6ec795b5659f99b4e8171af5e6c737f345e5a429f7b26f57e24ccc42fa2d8117b7ceff4dd100fe840064260fa17f203804e4b83ab06
 WHIRLPOOL 
79300674a1a326d95e80208cee664b0ddcd518653cac2aac381a3a32c1bcc40b4ddb00f95b064e119bc7f40098240e77b16898db688b87a2571ad523eac72a44

diff --git a/dev-python/flake8/flake8-3.0.4.ebuild 
b/dev-python/flake8/flake8-3.0.4.ebuild
new file mode 100644
index 00000000..3d9a910
--- /dev/null
+++ b/dev-python/flake8/flake8-3.0.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 
https://pypi.python.org/pypi/flake8";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+       >=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+       <dev-python/pyflakes-1.3[${PYTHON_USEDEP}]
+       !=dev-python/pyflakes-1.2.0[${PYTHON_USEDEP}]
+       !=dev-python/pyflakes-1.2.1[${PYTHON_USEDEP}]
+       !=dev-python/pyflakes-1.2.2[${PYTHON_USEDEP}]
+       >=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+       <=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}]
+       "
+DEPEND="${RDEPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       test? ( ${PDEPEND}
+           dev-python/nose[${PYTHON_USEDEP}]
+               dev-python/pytest-runner[${PYTHON_USEDEP}]
+           $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+           >=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+               <dev-python/mccabe-0.5[${PYTHON_USEDEP}]
+       )"
+PDEPEND="
+       >=dev-python/mccabe-0.5.0[${PYTHON_USEDEP}]
+       <dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+       >=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+       <=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}]
+       "
+
+python_prepare_all() {
+       # Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
+       sed -e 's:, != 1.6.2::' -i setup.py || die
+
+       distutils-r1_python_prepare_all
+}
+
+python_test() {
+       # The test suite assumes the presence of a tox.ini file in ${S},
+       # yet the distributed tarballs do not include that file.
+       touch "${S}/tox.ini" || die "Could not create tox.ini"
+
+       # using "test" instead of "ptr" results in name collisions
+       esetup.py ptr
+}

diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index d0cd909..a929946 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -2,3 +2,4 @@ DIST mccabe-0.2.1.tar.gz 5031 SHA256 
5a2a170e47de5593a6abfae1e9542bd2c3924ac62bb
 DIST mccabe-0.3.1.tar.gz 7586 SHA256 
5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16 SHA512 
83a5cb389343628b8a464f8f17452f116557735ed0a5f40411fe06f63af1f7c5ac4501fce2617a22fc7fb8395918deda2afba39728c1e72713930f14dddf08f9
 WHIRLPOOL 
2f8354395d9c291377ec8cac9f7911ffdeaf348f37ab7a0b3a87fb10ec0490e4e398963c02989de5240d54e1e4c34945fe15ad60c0b8605d5b8367f6efe7e72b
 DIST mccabe-0.3.tar.gz 6127 SHA256 
3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c SHA512 
3bb176d486de5e0d3de8db0bf923b4b03e5ad2fd82df079babd6e6551afe9077b956698ac335f23d340a16212d73c1c5ab5a3055d2788b7f81040f3cb0d1b4ee
 WHIRLPOOL 
bfa0480cca9cc082f60c20d07d6edac203c5e9144f2caf57576304dbf01c8a96b19e111f9e1abe5774a4de235729d69c3c89d4fddf8213f403568228e92f38f6
 DIST mccabe-0.4.0.tar.gz 7916 SHA256 
9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b SHA512 
4a7158a3a28eed0a98ae64b3a0394542f263c9b4e08fc31ad47b2317ba434b1002e13d40a9766e4e39ea798aa35e83a79b81936cebdaabdae582160f1780e1a2
 WHIRLPOOL 
d3b1ce9613ababb86f54e392fb9a5b5e96de7226ce6a3d6fd1c72ae2985c2dfe27319851ddaf8140b3b4f92f1b44f02683b88a2237539d5495199b479b267303
+DIST mccabe-0.5.2.tar.gz 8366 SHA256 
3473f06c8b757bbb5cdf295099bf64032e5f7d6fe0ec2f97ee9b23cb0a435aff SHA512 
08dbfadc4d270e5fe58492536a27d9008efd61c77aac817b2d77b9b4510cccb41e76e1e016ff1228ebe3ac6ea1cc6ce396601f6a692388e981ddba2549288e01
 WHIRLPOOL 
715242d4f242a1055b7e10abc3f03103bc221f3344682e0bdecb0e8eb7bdcd27812451c79ce68e4e3cdf8df7d514420acc31bf5aa0559ea41f17eb76a72c4b38

diff --git a/dev-python/mccabe/mccabe-0.5.2.ebuild 
b/dev-python/mccabe/mccabe-0.5.2.ebuild
new file mode 100644
index 00000000..343258f
--- /dev/null
+++ b/dev-python/mccabe/mccabe-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+       test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+       sed -i -e '/pytest-runner/d' setup.py || die
+       distutils-r1_python_prepare_all
+}
+
+python_test() {
+       py.test -v || die "Testing failed with ${EPYTHON}"
+}

Reply via email to