Date: Tuesday, May 19, 2015 @ 08:29:25 Author: fyan Revision: 133761 upgpkg: pep8 1.6.2-2
add patch for https://github.com/jcrocholl/pep8/commit/435d1cbf995a659a82d1d4b42d25e3459556ef21 to fix flake8 Added: pep8/trunk/revert-cli-options-only.patch Modified: pep8/trunk/PKGBUILD -------------------------------+ PKGBUILD | 11 ++++-- revert-cli-options-only.patch | 73 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-19 06:26:12 UTC (rev 133760) +++ PKGBUILD 2015-05-19 06:29:25 UTC (rev 133761) @@ -6,16 +6,21 @@ pkgbase=pep8 pkgname=("$pkgbase" "python2-$pkgbase") pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Python style guide checker" arch=('any') url="http://github.com/jcrocholl/pep8/" license=('custom:Expat') makedepends=('python-setuptools' 'python2-setuptools' 'git') -source=("git+https://github.com/jcrocholl/${pkgbase}.git#tag=$pkgver") -sha256sums=('SKIP') +source=("git+https://github.com/jcrocholl/${pkgbase}.git#tag=$pkgver" + revert-cli-options-only.patch) +sha256sums=('SKIP' + 'ffa25c07cbff7f20e799c5ad6f0bc205c255898ffc7bab3c4157abfb83c43f7b') prepare() { + # Cherry-picked from https://github.com/jcrocholl/pep8/commit/435d1cbf995a659a82d1d4b42d25e3459556ef21 + (cd $pkgbase; patch -p1 -i ../revert-cli-options-only.patch) + cp -a $pkgbase{,-py2} sed -i '1s/env python$/python2/' $pkgbase-py2/pep8.py Added: revert-cli-options-only.patch =================================================================== --- revert-cli-options-only.patch (rev 0) +++ revert-cli-options-only.patch 2015-05-19 06:29:25 UTC (rev 133761) @@ -0,0 +1,73 @@ +From 435d1cbf995a659a82d1d4b42d25e3459556ef21 Mon Sep 17 00:00:00 2001 +From: Ian Lee <ianlee1...@gmail.com> +Date: Tue, 17 Mar 2015 21:52:23 -0700 +Subject: [PATCH] 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 +--- + CHANGES.txt | 6 ++++++ + pep8.py | 28 ++++++++++++++-------------- + 2 files changed, 20 insertions(+), 14 deletions(-) + +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):