Skip to content

Commit 865b153

Browse files
authored
Merge branch 'main' into black-update-patch
2 parents 04fc520 + a2c4e49 commit 865b153

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

.pylintrc

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
15
[MASTER]
26

37
# A comma-separated list of package or module names from where C extensions may
48
# be loaded. Extensions are loading into the active Python interpreter and may
59
# run arbitrary code
610
extension-pkg-whitelist=
711

8-
# Add files or directories to the blacklist. They should be base names, not
12+
# Add files or directories to the ignore-list. They should be base names, not
913
# paths.
1014
ignore=CVS
1115

12-
# Add files or directories matching the regex patterns to the blacklist. The
16+
# Add files or directories matching the regex patterns to the ignore-list. The
1317
# regex matches against base names, not paths.
1418
ignore-patterns=
1519

@@ -50,21 +54,8 @@ confidence=
5054
# --enable=similarities". If you want to run only the classes checker, but have
5155
# no Warning level messages displayed, use"--disable=all --enable=classes
5256
# --disable=W"
53-
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,
54-
long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,
55-
raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,
56-
suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,
57-
buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,
58-
raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,
59-
coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,
60-
old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,
61-
indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,
62-
cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,
63-
map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,
64-
filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,
65-
rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,
66-
deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,
67-
subprocess-run-check,too-many-lines
57+
# 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
58+
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-methd,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,pointless-string-statement
6859

6960
# Enable the message, report, category or checker with the given id(s). You can
7061
# either give multiple identifier separated by comma (,) or put this option
@@ -145,7 +136,7 @@ contextmanager-decorators=contextlib.contextmanager
145136
# List of members which are set dynamically and missed by pylint inference
146137
# system, and so shouldn't trigger E1101 when accessed. Python regular
147138
# expressions are accepted.
148-
generated-members=sh.ErrorReturnCode_1,sh.ErrorReturnCode_128
139+
generated-members=
149140

150141
# Tells whether missing members accessed in mixin class should be ignored. A
151142
# mixin class is detected if its name ends with "mixin" (case insensitive).
@@ -168,7 +159,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local
168159
# (useful for modules/projects where namespaces are manipulated during runtime
169160
# and thus existing member attributes cannot be deduced by static analysis. It
170161
# supports qualified module names, as well as Unix pattern matching.
171-
ignored-modules=
162+
ignored-modules=board
172163

173164
# Show a hint with possible names when a member name was not found. The aspect
174165
# of finding the hint is based on edit distance.
@@ -261,7 +252,7 @@ ignore-docstrings=yes
261252
ignore-imports=yes
262253

263254
# Minimum lines number of a similarity.
264-
min-similarity-lines=50
255+
min-similarity-lines=24
265256

266257

267258
[BASIC]

adabot/circuitpython_bundle.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ def update_bundle(bundle_path):
207207
# They will contain a '-' in the tag, such as '3.0.0-beta.5'.
208208
# --exclude must be before --tags.
209209
# sh fails to find the subcommand so we use subprocess.
210+
210211
subprocess.run( # pylint: disable=subprocess-run-check
211212
shlex.split(
212213
"git submodule foreach 'git checkout -q "

adabot/lib/circuitpython_library_validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pylint: disable=no-self-use
1+
# pylint: disable=no-self-use,too-many-lines
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries

0 commit comments

Comments
 (0)