* [gentoo-commits] repo/gentoo:master commit in: dev-python/pep8/, dev-python/pep8/files/
@ 2015-09-25 5:34 Ian Delaney
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney @ 2015-09-25 5:34 UTC (permalink / raw
To: gentoo-commits
commit: f9eac8f6c208ecdad7c3848b7becd6c426fee78b
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 04:26:31 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 05:33:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9eac8f6
dev-python/pep8: revbump to 1.6.2-r1
backport upstream patch restoring flake8 compatibility, patch by maintainer
see https://github.com/gentoo/gentoo/pull/129/ and Bug #561394
Package-Manager: portage-2.2.20.1
.../pep8-1.6.2-restore-flake8-compatibility.patch | 69 ++++++++++++++++++++++
dev-python/pep8/pep8-1.6.2-r1.ebuild | 37 ++++++++++++
2 files changed, 106 insertions(+)
diff --git a/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch b/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch
new file mode 100644
index 0000000..f355772
--- /dev/null
+++ b/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch
@@ -0,0 +1,69 @@
+commit 435d1cbf995a659a82d1d4b42d25e3459556ef21
+Author: Ian Lee <IanLee1521@gmail.com>
+Date: Tue Mar 17 21:52:23 2015 -0700
+
+ Reverted fix for #368 which had unintended repurcussions in flake8 and other places.
+
+ This fix reverts to the parsing of user config (~/.config/pep8), then local directory
+ config files, and finally overrides with cli options as was the behavior back in 1.5.7
+
+diff --git a/CHANGES.txt b/CHANGES.txt
+index 85eb043..5499abd 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
+@@ -5,6 +5,12 @@ Changelog
+ 1.6.x (unreleased)
+ ------------------
+
++Changes:
++
++* Reverted the fix in #368, "options passed on command line are only ones
++ accepted" feature. This has many unintended consequences in pep8 and flake8
++ and needs to be reworked when I have more time.
++
+ 1.6.2 (2015-02-15)
+ ------------------
+
+diff --git a/pep8.py b/pep8.py
+index 9f40381..4d993da 100755
+--- a/pep8.py
++++ b/pep8.py
+@@ -1984,24 +1984,24 @@ def read_config(options, args, arglist, parser):
+
+ local_dir = os.curdir
+
++ if USER_CONFIG and os.path.isfile(USER_CONFIG):
++ if options.verbose:
++ print('user configuration: %s' % USER_CONFIG)
++ config.read(USER_CONFIG)
++
++ parent = tail = args and os.path.abspath(os.path.commonprefix(args))
++ while tail:
++ if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
++ local_dir = parent
++ if options.verbose:
++ print('local configuration: in %s' % parent)
++ break
++ (parent, tail) = os.path.split(parent)
++
+ if cli_conf and os.path.isfile(cli_conf):
+ if options.verbose:
+ print('cli configuration: %s' % cli_conf)
+ config.read(cli_conf)
+- else:
+- if USER_CONFIG and os.path.isfile(USER_CONFIG):
+- if options.verbose:
+- print('user configuration: %s' % USER_CONFIG)
+- config.read(USER_CONFIG)
+-
+- parent = tail = args and os.path.abspath(os.path.commonprefix(args))
+- while tail:
+- if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
+- local_dir = parent
+- if options.verbose:
+- print('local configuration: in %s' % parent)
+- break
+- (parent, tail) = os.path.split(parent)
+
+ pep8_section = parser.prog
+ if config.has_section(pep8_section):
diff --git a/dev-python/pep8/pep8-1.6.2-r1.ebuild b/dev-python/pep8/pep8-1.6.2-r1.ebuild
new file mode 100644
index 0000000..c9ac898
--- /dev/null
+++ b/dev-python/pep8/pep8-1.6.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-restore-flake8-compatibility.patch" )
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+ PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pep8/, dev-python/pep8/files/
@ 2017-05-03 7:37 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2017-05-03 7:37 UTC (permalink / raw
To: gentoo-commits
commit: b14b9c9ea535e5bb87f9129400c3b2401735d81b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 07:14:53 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 3 07:37:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14b9c9e
dev-python/pep8: Clean old versions up
dev-python/pep8/Manifest | 2 -
.../pep8-1.6.2-restore-flake8-compatibility.patch | 69 ----------------------
dev-python/pep8/pep8-1.6.1.ebuild | 34 -----------
dev-python/pep8/pep8-1.6.2-r1.ebuild | 37 ------------
dev-python/pep8/pep8-1.6.2.ebuild | 34 -----------
5 files changed, 176 deletions(-)
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 756a13df830..c28d0890a2f 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,6 +1,4 @@
DIST pep8-1.4.5.tar.gz 63021 SHA256 dd908e7df835ebb1b82ba0675e1b7e173ea9c55d7ae62808ecad2e6db2a6ee0e SHA512 c4d8e5b116762480e1aad2ddad1cd02d2d74779adcef8153739c7ca1e56d33bd81b42c984c525797548d915245f24d3cea636d6b89ade8e9e428f31b0a6fe8a6 WHIRLPOOL c597328ce58d226311162c7126c949f92e9142f0fa9a979cdd0ede29f71b839587ef4c5cef57ac8fdd608753f52a6c91220b90807ca9b3b56cc5b5772c688b9a
DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dde4adeea01576e4bf041a SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1 WHIRLPOOL 97f90d9b4ae69d87cf5eb014998f74d8fc97640a31a457a2b39db495eeb9bc0634d5a56a6bf7636d44dbef70179a3c0c0098e7963a5d63e7d3cfccd0b250675b
DIST pep8-1.5.7.tar.gz 67302 SHA256 15b42131b25f376165d195fe4e17b0a28311182aaf9330d5eb575bbeda5a6989 SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb WHIRLPOOL 09621e17fec73de00ab4840365898084651bab4cbcf982a1393eba5e0bb2d04c0374c5dd69bf6915b6542b4ce6ac13a614395811387badf6384f266d0b61fec3
-DIST pep8-1.6.1.tar.gz 73103 SHA256 573677cb85ff089244b0f99af955f76c2e37456632610b6deda6167139ce155a SHA512 7a9d83cfe7b61b2ef598c74a465b81971ad1d0be3a708410e431d8475fc507204979857c10dbf4332701aac0d28244f19dc9c400ca85161acdd61d8084158ef8 WHIRLPOOL 0a032be9cdea4f45c86255dddbb06e1629e148e8b15e6a83d8abc7ed06f52d6c184f2953367dca5b94978e2351b3873c6cf3bc02c811aa9f8ce50964b31306c5
-DIST pep8-1.6.2.tar.gz 74534 SHA256 b8b7e35630b5539e26a197dfc6005be9e1e9a135496b377723a8ebc01b9bcbff SHA512 f046a1e3ed68a7c409ad6c501a54ed14188de670f0e0d873d2d7960e45fec0c4e2c27067877854ecbb20f3690f9d2ca1fa4bc1cc52b22e1f71bd0aec4ddb6fc9 WHIRLPOOL cf482b333da7a7c936277e2fdab057b6e9b30ef7597dde0f4e49abc3b18727584814779d15216977371a8e72b593395083bda8728600d55fab6ce3b43ce777ee
DIST pep8-1.7.0.tar.gz 79704 SHA256 a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a WHIRLPOOL 6ff0baa6c1aec5db641cff6cefdb2310f31af482c92e97d27edd3b9ae85d8f255c1283cd9261b9db74d5d5d4c73c72180e55edb3303f2f018889bab7ea9b00a3
diff --git a/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch b/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch
deleted file mode 100644
index f3557728a73..00000000000
--- a/dev-python/pep8/files/pep8-1.6.2-restore-flake8-compatibility.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 435d1cbf995a659a82d1d4b42d25e3459556ef21
-Author: Ian Lee <IanLee1521@gmail.com>
-Date: Tue Mar 17 21:52:23 2015 -0700
-
- Reverted fix for #368 which had unintended repurcussions in flake8 and other places.
-
- This fix reverts to the parsing of user config (~/.config/pep8), then local directory
- config files, and finally overrides with cli options as was the behavior back in 1.5.7
-
-diff --git a/CHANGES.txt b/CHANGES.txt
-index 85eb043..5499abd 100644
---- a/CHANGES.txt
-+++ b/CHANGES.txt
-@@ -5,6 +5,12 @@ Changelog
- 1.6.x (unreleased)
- ------------------
-
-+Changes:
-+
-+* Reverted the fix in #368, "options passed on command line are only ones
-+ accepted" feature. This has many unintended consequences in pep8 and flake8
-+ and needs to be reworked when I have more time.
-+
- 1.6.2 (2015-02-15)
- ------------------
-
-diff --git a/pep8.py b/pep8.py
-index 9f40381..4d993da 100755
---- a/pep8.py
-+++ b/pep8.py
-@@ -1984,24 +1984,24 @@ def read_config(options, args, arglist, parser):
-
- local_dir = os.curdir
-
-+ if USER_CONFIG and os.path.isfile(USER_CONFIG):
-+ if options.verbose:
-+ print('user configuration: %s' % USER_CONFIG)
-+ config.read(USER_CONFIG)
-+
-+ parent = tail = args and os.path.abspath(os.path.commonprefix(args))
-+ while tail:
-+ if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
-+ local_dir = parent
-+ if options.verbose:
-+ print('local configuration: in %s' % parent)
-+ break
-+ (parent, tail) = os.path.split(parent)
-+
- if cli_conf and os.path.isfile(cli_conf):
- if options.verbose:
- print('cli configuration: %s' % cli_conf)
- config.read(cli_conf)
-- else:
-- if USER_CONFIG and os.path.isfile(USER_CONFIG):
-- if options.verbose:
-- print('user configuration: %s' % USER_CONFIG)
-- config.read(USER_CONFIG)
--
-- parent = tail = args and os.path.abspath(os.path.commonprefix(args))
-- while tail:
-- if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
-- local_dir = parent
-- if options.verbose:
-- print('local configuration: in %s' % parent)
-- break
-- (parent, tail) = os.path.split(parent)
-
- pep8_section = parser.prog
- if config.has_section(pep8_section):
diff --git a/dev-python/pep8/pep8-1.6.1.ebuild b/dev-python/pep8/pep8-1.6.1.ebuild
deleted file mode 100644
index 7c2c499d7e5..00000000000
--- a/dev-python/pep8/pep8-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
- PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.6.2-r1.ebuild b/dev-python/pep8/pep8-1.6.2-r1.ebuild
deleted file mode 100644
index 671865f1441..00000000000
--- a/dev-python/pep8/pep8-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-restore-flake8-compatibility.patch" )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
- PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.6.2.ebuild b/dev-python/pep8/pep8-1.6.2.ebuild
deleted file mode 100644
index 7d30c743878..00000000000
--- a/dev-python/pep8/pep8-1.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
- PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-03 7:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-25 5:34 [gentoo-commits] repo/gentoo:master commit in: dev-python/pep8/, dev-python/pep8/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2017-05-03 7:37 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox