Skip to content

Commit 3a6e891

Browse files
authored
Merge pull request #147 from sommersoft/patch_update_pylintrc
Git Patch File Updates
2 parents 06f6235 + 6366b20 commit 3a6e891

File tree

3 files changed

+30
-32
lines changed

3 files changed

+30
-32
lines changed

adabot/circuitpython_library_patches.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,11 @@ def check_patches(repo, patches, flags, use_apply, dry_run):
173173
run_apply = False
174174
if (b"error" not in Err.stderr or
175175
b"patch does not apply" in Err.stderr):
176+
parse_err = Err.stderr.decode()
177+
parse_err = parse_err[parse_err.rfind(":")+1:-1]
178+
print(
179+
" . Skipping {}:{}".format(repo["name"], parse_err)
180+
)
176181
skipped += 1
177182
else:
178183
failed += 1

patches/0001-build.yml-move-pylint-black-and-Sphinx-installs-to-e.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 8c6fff6741433eb7ecde1d8b8ddd4af49fbe2bf6 Mon Sep 17 00:00:00 2001
2+
From: sommersoft <[email protected]>
3+
Date: Thu, 5 Mar 2020 22:06:59 -0600
4+
Subject: [PATCH 1/2] update pylintrc for black
5+
6+
---
7+
.pylintrc | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/.pylintrc b/.pylintrc
11+
index 039eaec..d8f0ee8 100644
12+
--- a/.pylintrc
13+
+++ b/.pylintrc
14+
@@ -52,7 +52,7 @@ confidence=
15+
# no Warning level messages displayed, use"--disable=all --enable=classes
16+
# --disable=W"
17+
# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
18+
-disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error
19+
+disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation
20+
21+
# Enable the message, report, category or checker with the given id(s). You can
22+
# either give multiple identifier separated by comma (,) or put this option
23+
--
24+
2.17.1
25+

0 commit comments

Comments
 (0)