Merge 94ff9c0b51 into 1b0c94a386
This commit is contained in:
commit
83f7564697
12 changed files with 65 additions and 484 deletions
5
.gitattributes
vendored
Normal file
5
.gitattributes
vendored
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries
|
||||
#
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
* text eol=lf
|
||||
|
|
@ -1,42 +1,21 @@
|
|||
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
|
||||
# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries
|
||||
#
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
repos:
|
||||
- repo: https://github.com/python/black
|
||||
rev: 23.3.0
|
||||
hooks:
|
||||
- id: black
|
||||
- repo: https://github.com/fsfe/reuse-tool
|
||||
rev: v1.1.2
|
||||
hooks:
|
||||
- id: reuse
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v4.4.0
|
||||
rev: v4.5.0
|
||||
hooks:
|
||||
- id: check-yaml
|
||||
- id: end-of-file-fixer
|
||||
- id: trailing-whitespace
|
||||
- repo: https://github.com/pycqa/pylint
|
||||
rev: v2.17.4
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.3.4
|
||||
hooks:
|
||||
- id: pylint
|
||||
name: pylint (library code)
|
||||
types: [python]
|
||||
args:
|
||||
- --disable=consider-using-f-string
|
||||
exclude: "^(docs/|examples/|tests/|setup.py$)"
|
||||
- id: pylint
|
||||
name: pylint (example code)
|
||||
description: Run pylint rules on "examples/*.py" files
|
||||
types: [python]
|
||||
files: "^examples/"
|
||||
args:
|
||||
- --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
|
||||
- id: pylint
|
||||
name: pylint (test code)
|
||||
description: Run pylint rules on "tests/*.py" files
|
||||
types: [python]
|
||||
files: "^tests/"
|
||||
args:
|
||||
- --disable=missing-docstring,consider-using-f-string,duplicate-code
|
||||
- id: ruff-format
|
||||
- id: ruff
|
||||
args: ["--fix"]
|
||||
- repo: https://github.com/fsfe/reuse-tool
|
||||
rev: v3.0.1
|
||||
hooks:
|
||||
- id: reuse
|
||||
|
|
|
|||
399
.pylintrc
399
.pylintrc
|
|
@ -1,399 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
|
||||
#
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
[MASTER]
|
||||
|
||||
# A comma-separated list of package or module names from where C extensions may
|
||||
# be loaded. Extensions are loading into the active Python interpreter and may
|
||||
# run arbitrary code
|
||||
extension-pkg-whitelist=
|
||||
|
||||
# Add files or directories to the ignore-list. They should be base names, not
|
||||
# paths.
|
||||
ignore=CVS
|
||||
|
||||
# Add files or directories matching the regex patterns to the ignore-list. The
|
||||
# regex matches against base names, not paths.
|
||||
ignore-patterns=
|
||||
|
||||
# Python code to execute, usually for sys.path manipulation such as
|
||||
# pygtk.require().
|
||||
#init-hook=
|
||||
|
||||
# Use multiple processes to speed up Pylint.
|
||||
jobs=1
|
||||
|
||||
# List of plugins (as comma separated values of python modules names) to load,
|
||||
# usually to register additional checkers.
|
||||
load-plugins=pylint.extensions.no_self_use
|
||||
|
||||
# Pickle collected data for later comparisons.
|
||||
persistent=yes
|
||||
|
||||
# Specify a configuration file.
|
||||
#rcfile=
|
||||
|
||||
# Allow loading of arbitrary C extensions. Extensions are imported into the
|
||||
# active Python interpreter and may run arbitrary code.
|
||||
unsafe-load-any-extension=no
|
||||
|
||||
|
||||
[MESSAGES CONTROL]
|
||||
|
||||
# Only show warnings with the listed confidence levels. Leave empty to show
|
||||
# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
|
||||
confidence=
|
||||
|
||||
# Disable the message, report, category or checker with the given id(s). You
|
||||
# can either give multiple identifiers separated by comma (,) or put this
|
||||
# option multiple times (only on the command line, not in the configuration
|
||||
# file where it should appear only once).You can also use "--disable=all" to
|
||||
# disable everything first and then reenable specific checks. For example, if
|
||||
# you want to run only the similarities checker, you can use "--disable=all
|
||||
# --enable=similarities". If you want to run only the classes checker, but have
|
||||
# no Warning level messages displayed, use"--disable=all --enable=classes
|
||||
# --disable=W"
|
||||
# disable=import-error,raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,deprecated-str-translate-call
|
||||
disable=raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,import-error,pointless-string-statement,unspecified-encoding
|
||||
|
||||
# Enable the message, report, category or checker with the given id(s). You can
|
||||
# either give multiple identifier separated by comma (,) or put this option
|
||||
# multiple time (only on the command line, not in the configuration file where
|
||||
# it should appear only once). See also the "--disable" option for examples.
|
||||
enable=
|
||||
|
||||
|
||||
[REPORTS]
|
||||
|
||||
# Python expression which should return a note less than 10 (10 is the highest
|
||||
# note). You have access to the variables errors warning, statement which
|
||||
# respectively contain the number of errors / warnings messages and the total
|
||||
# number of statements analyzed. This is used by the global evaluation report
|
||||
# (RP0004).
|
||||
evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
|
||||
|
||||
# Template used to display messages. This is a python new-style format string
|
||||
# used to format the message information. See doc for all details
|
||||
#msg-template=
|
||||
|
||||
# Set the output format. Available formats are text, parseable, colorized, json
|
||||
# and msvs (visual studio).You can also give a reporter class, eg
|
||||
# mypackage.mymodule.MyReporterClass.
|
||||
output-format=text
|
||||
|
||||
# Tells whether to display a full report or only the messages
|
||||
reports=no
|
||||
|
||||
# Activate the evaluation score.
|
||||
score=yes
|
||||
|
||||
|
||||
[REFACTORING]
|
||||
|
||||
# Maximum number of nested blocks for function / method body
|
||||
max-nested-blocks=5
|
||||
|
||||
|
||||
[LOGGING]
|
||||
|
||||
# Logging modules to check that the string format arguments are in logging
|
||||
# function parameter format
|
||||
logging-modules=logging
|
||||
|
||||
|
||||
[SPELLING]
|
||||
|
||||
# Spelling dictionary name. Available dictionaries: none. To make it working
|
||||
# install python-enchant package.
|
||||
spelling-dict=
|
||||
|
||||
# List of comma separated words that should not be checked.
|
||||
spelling-ignore-words=
|
||||
|
||||
# A path to a file that contains private dictionary; one word per line.
|
||||
spelling-private-dict-file=
|
||||
|
||||
# Tells whether to store unknown words to indicated private dictionary in
|
||||
# --spelling-private-dict-file option instead of raising a message.
|
||||
spelling-store-unknown-words=no
|
||||
|
||||
|
||||
[MISCELLANEOUS]
|
||||
|
||||
# List of note tags to take in consideration, separated by a comma.
|
||||
# notes=FIXME,XXX,TODO
|
||||
notes=FIXME,XXX
|
||||
|
||||
|
||||
[TYPECHECK]
|
||||
|
||||
# List of decorators that produce context managers, such as
|
||||
# contextlib.contextmanager. Add to this list to register other decorators that
|
||||
# produce valid context managers.
|
||||
contextmanager-decorators=contextlib.contextmanager
|
||||
|
||||
# List of members which are set dynamically and missed by pylint inference
|
||||
# system, and so shouldn't trigger E1101 when accessed. Python regular
|
||||
# expressions are accepted.
|
||||
generated-members=
|
||||
|
||||
# Tells whether missing members accessed in mixin class should be ignored. A
|
||||
# mixin class is detected if its name ends with "mixin" (case insensitive).
|
||||
ignore-mixin-members=yes
|
||||
|
||||
# This flag controls whether pylint should warn about no-member and similar
|
||||
# checks whenever an opaque object is returned when inferring. The inference
|
||||
# can return multiple potential results while evaluating a Python object, but
|
||||
# some branches might not be evaluated, which results in partial inference. In
|
||||
# that case, it might be useful to still emit no-member and other checks for
|
||||
# the rest of the inferred objects.
|
||||
ignore-on-opaque-inference=yes
|
||||
|
||||
# List of class names for which member attributes should not be checked (useful
|
||||
# for classes with dynamically set attributes). This supports the use of
|
||||
# qualified names.
|
||||
ignored-classes=optparse.Values,thread._local,_thread._local
|
||||
|
||||
# List of module names for which member attributes should not be checked
|
||||
# (useful for modules/projects where namespaces are manipulated during runtime
|
||||
# and thus existing member attributes cannot be deduced by static analysis. It
|
||||
# supports qualified module names, as well as Unix pattern matching.
|
||||
ignored-modules=board
|
||||
|
||||
# Show a hint with possible names when a member name was not found. The aspect
|
||||
# of finding the hint is based on edit distance.
|
||||
missing-member-hint=yes
|
||||
|
||||
# The minimum edit distance a name should have in order to be considered a
|
||||
# similar match for a missing member name.
|
||||
missing-member-hint-distance=1
|
||||
|
||||
# The total number of similar names that should be taken in consideration when
|
||||
# showing a hint for a missing member.
|
||||
missing-member-max-choices=1
|
||||
|
||||
|
||||
[VARIABLES]
|
||||
|
||||
# List of additional names supposed to be defined in builtins. Remember that
|
||||
# you should avoid to define new builtins when possible.
|
||||
additional-builtins=
|
||||
|
||||
# Tells whether unused global variables should be treated as a violation.
|
||||
allow-global-unused-variables=yes
|
||||
|
||||
# List of strings which can identify a callback function by name. A callback
|
||||
# name must start or end with one of those strings.
|
||||
callbacks=cb_,_cb
|
||||
|
||||
# A regular expression matching the name of dummy variables (i.e. expectedly
|
||||
# not used).
|
||||
dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
|
||||
|
||||
# Argument names that match this expression will be ignored. Default to name
|
||||
# with leading underscore
|
||||
ignored-argument-names=_.*|^ignored_|^unused_
|
||||
|
||||
# Tells whether we should check for unused import in __init__ files.
|
||||
init-import=no
|
||||
|
||||
# List of qualified module names which can have objects that can redefine
|
||||
# builtins.
|
||||
redefining-builtins-modules=six.moves,future.builtins
|
||||
|
||||
|
||||
[FORMAT]
|
||||
|
||||
# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
|
||||
# expected-line-ending-format=
|
||||
expected-line-ending-format=LF
|
||||
|
||||
# Regexp for a line that is allowed to be longer than the limit.
|
||||
ignore-long-lines=^\s*(# )?<?https?://\S+>?$
|
||||
|
||||
# Number of spaces of indent required inside a hanging or continued line.
|
||||
indent-after-paren=4
|
||||
|
||||
# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
|
||||
# tab).
|
||||
indent-string=' '
|
||||
|
||||
# Maximum number of characters on a single line.
|
||||
max-line-length=100
|
||||
|
||||
# Maximum number of lines in a module
|
||||
max-module-lines=1000
|
||||
|
||||
# Allow the body of a class to be on the same line as the declaration if body
|
||||
# contains single statement.
|
||||
single-line-class-stmt=no
|
||||
|
||||
# Allow the body of an if to be on the same line as the test if there is no
|
||||
# else.
|
||||
single-line-if-stmt=no
|
||||
|
||||
|
||||
[SIMILARITIES]
|
||||
|
||||
# Ignore comments when computing similarities.
|
||||
ignore-comments=yes
|
||||
|
||||
# Ignore docstrings when computing similarities.
|
||||
ignore-docstrings=yes
|
||||
|
||||
# Ignore imports when computing similarities.
|
||||
ignore-imports=yes
|
||||
|
||||
# Minimum lines number of a similarity.
|
||||
min-similarity-lines=12
|
||||
|
||||
|
||||
[BASIC]
|
||||
|
||||
# Regular expression matching correct argument names
|
||||
argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
|
||||
|
||||
# Regular expression matching correct attribute names
|
||||
attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
|
||||
|
||||
# Bad variable names which should always be refused, separated by a comma
|
||||
bad-names=foo,bar,baz,toto,tutu,tata
|
||||
|
||||
# Regular expression matching correct class attribute names
|
||||
class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
|
||||
|
||||
# Regular expression matching correct class names
|
||||
# class-rgx=[A-Z_][a-zA-Z0-9]+$
|
||||
class-rgx=[A-Z_][a-zA-Z0-9_]+$
|
||||
|
||||
# Regular expression matching correct constant names
|
||||
const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
|
||||
|
||||
# Minimum line length for functions/classes that require docstrings, shorter
|
||||
# ones are exempt.
|
||||
docstring-min-length=-1
|
||||
|
||||
# Regular expression matching correct function names
|
||||
function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
|
||||
|
||||
# Good variable names which should always be accepted, separated by a comma
|
||||
# good-names=i,j,k,ex,Run,_
|
||||
good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_
|
||||
|
||||
# Include a hint for the correct naming format with invalid-name
|
||||
include-naming-hint=no
|
||||
|
||||
# Regular expression matching correct inline iteration names
|
||||
inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
|
||||
|
||||
# Regular expression matching correct method names
|
||||
method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
|
||||
|
||||
# Regular expression matching correct module names
|
||||
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
|
||||
|
||||
# Colon-delimited sets of names that determine each other's naming style when
|
||||
# the name regexes allow several styles.
|
||||
name-group=
|
||||
|
||||
# Regular expression which should only match function or class names that do
|
||||
# not require a docstring.
|
||||
no-docstring-rgx=^_
|
||||
|
||||
# List of decorators that produce properties, such as abc.abstractproperty. Add
|
||||
# to this list to register other decorators that produce valid properties.
|
||||
property-classes=abc.abstractproperty
|
||||
|
||||
# Regular expression matching correct variable names
|
||||
variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
|
||||
|
||||
|
||||
[IMPORTS]
|
||||
|
||||
# Allow wildcard imports from modules that define __all__.
|
||||
allow-wildcard-with-all=no
|
||||
|
||||
# Analyse import fallback blocks. This can be used to support both Python 2 and
|
||||
# 3 compatible code, which means that the block might have code that exists
|
||||
# only in one or another interpreter, leading to false positives when analysed.
|
||||
analyse-fallback-blocks=no
|
||||
|
||||
# Deprecated modules which should not be used, separated by a comma
|
||||
deprecated-modules=optparse,tkinter.tix
|
||||
|
||||
# Create a graph of external dependencies in the given file (report RP0402 must
|
||||
# not be disabled)
|
||||
ext-import-graph=
|
||||
|
||||
# Create a graph of every (i.e. internal and external) dependencies in the
|
||||
# given file (report RP0402 must not be disabled)
|
||||
import-graph=
|
||||
|
||||
# Create a graph of internal dependencies in the given file (report RP0402 must
|
||||
# not be disabled)
|
||||
int-import-graph=
|
||||
|
||||
# Force import order to recognize a module as part of the standard
|
||||
# compatibility libraries.
|
||||
known-standard-library=
|
||||
|
||||
# Force import order to recognize a module as part of a third party library.
|
||||
known-third-party=enchant
|
||||
|
||||
|
||||
[CLASSES]
|
||||
|
||||
# List of method names used to declare (i.e. assign) instance attributes.
|
||||
defining-attr-methods=__init__,__new__,setUp
|
||||
|
||||
# List of member names, which should be excluded from the protected access
|
||||
# warning.
|
||||
exclude-protected=_asdict,_fields,_replace,_source,_make
|
||||
|
||||
# List of valid names for the first argument in a class method.
|
||||
valid-classmethod-first-arg=cls
|
||||
|
||||
# List of valid names for the first argument in a metaclass class method.
|
||||
valid-metaclass-classmethod-first-arg=mcs
|
||||
|
||||
|
||||
[DESIGN]
|
||||
|
||||
# Maximum number of arguments for function / method
|
||||
max-args=5
|
||||
|
||||
# Maximum number of attributes for a class (see R0902).
|
||||
# max-attributes=7
|
||||
max-attributes=11
|
||||
|
||||
# Maximum number of boolean expressions in a if statement
|
||||
max-bool-expr=5
|
||||
|
||||
# Maximum number of branch for function / method body
|
||||
max-branches=12
|
||||
|
||||
# Maximum number of locals for function / method body
|
||||
max-locals=15
|
||||
|
||||
# Maximum number of parents for a class (see R0901).
|
||||
max-parents=7
|
||||
|
||||
# Maximum number of public methods for a class (see R0904).
|
||||
max-public-methods=20
|
||||
|
||||
# Maximum number of return / yield for function / method body
|
||||
max-returns=6
|
||||
|
||||
# Maximum number of statements in function / method body
|
||||
max-statements=50
|
||||
|
||||
# Minimum number of public methods for a class (see R0903).
|
||||
min-public-methods=1
|
||||
|
||||
|
||||
[EXCEPTIONS]
|
||||
|
||||
# Exceptions that will emit a warning when being caught. Defaults to
|
||||
# "Exception"
|
||||
overgeneral-exceptions=builtins.Exception
|
||||
|
|
@ -13,9 +13,9 @@ Introduction
|
|||
:target: https://github.com/adafruit/Adafruit_CircuitPython_PortalBase/actions
|
||||
:alt: Build Status
|
||||
|
||||
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
|
||||
:target: https://github.com/psf/black
|
||||
:alt: Code Style: Black
|
||||
.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
|
||||
:target: https://github.com/astral-sh/ruff
|
||||
:alt: Code Style: Ruff
|
||||
|
||||
Base Library for the Portal-style libraries. This library only contains base classes and is not
|
||||
intended to be run on its own.
|
||||
|
|
|
|||
|
|
@ -20,12 +20,14 @@ Implementation Notes
|
|||
https://github.com/adafruit/circuitpython/releases
|
||||
|
||||
"""
|
||||
|
||||
import gc
|
||||
import time
|
||||
|
||||
import terminalio
|
||||
from adafruit_bitmap_font import bitmap_font
|
||||
from adafruit_display_text.bitmap_label import Label
|
||||
from adafruit_display_text import wrap_text_to_lines
|
||||
from adafruit_display_text.bitmap_label import Label
|
||||
|
||||
__version__ = "0.0.0+auto.0"
|
||||
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PortalBase.git"
|
||||
|
|
@ -55,8 +57,7 @@ class PortalBase:
|
|||
|
||||
"""
|
||||
|
||||
# pylint: disable=too-many-instance-attributes, too-many-branches, too-many-public-methods
|
||||
def __init__(
|
||||
def __init__( # noqa: PLR0912,PLR0913 Too many branches,Too many arguments in function definition
|
||||
self,
|
||||
network,
|
||||
graphics,
|
||||
|
|
@ -84,7 +85,7 @@ class PortalBase:
|
|||
self._text = []
|
||||
|
||||
try:
|
||||
import alarm # pylint: disable=import-outside-toplevel
|
||||
import alarm
|
||||
|
||||
self._alarm = alarm
|
||||
except ImportError:
|
||||
|
|
@ -156,8 +157,7 @@ class PortalBase:
|
|||
"""
|
||||
return wrap_text_to_lines(string, max_chars)
|
||||
|
||||
# pylint: disable=too-many-arguments
|
||||
def add_text(
|
||||
def add_text( # noqa: PLR0913 Too many arguments in function definition
|
||||
self,
|
||||
text_position=(0, 0),
|
||||
text_font=terminalio.FONT,
|
||||
|
|
@ -235,8 +235,6 @@ class PortalBase:
|
|||
|
||||
return text_index
|
||||
|
||||
# pylint: enable=too-many-arguments
|
||||
|
||||
def remove_all_text(self, clear_font_cache=False):
|
||||
"""Remove all added text and labels.
|
||||
|
||||
|
|
@ -252,7 +250,7 @@ class PortalBase:
|
|||
self._fonts = {}
|
||||
gc.collect()
|
||||
|
||||
def set_text(self, val, index=0):
|
||||
def set_text(self, val, index=0): # noqa: PLR0912 Too many branches
|
||||
"""Display text, with indexing into our list of text boxes.
|
||||
|
||||
:param str val: The text to be displayed
|
||||
|
|
@ -309,13 +307,11 @@ class PortalBase:
|
|||
gc.collect()
|
||||
|
||||
def preload_font(self, glyphs=None, index=0):
|
||||
# pylint: disable=line-too-long
|
||||
"""Preload font.
|
||||
|
||||
:param glyphs: The font glyphs to load. Defaults to ``None``, uses alphanumeric glyphs if
|
||||
None.
|
||||
"""
|
||||
# pylint: enable=line-too-long
|
||||
if not glyphs:
|
||||
glyphs = b"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-!,. \"'?!"
|
||||
print("Preloading font glyphs:", glyphs)
|
||||
|
|
@ -469,7 +465,7 @@ class PortalBase:
|
|||
# fill out all the text blocks
|
||||
if self._text:
|
||||
value_index = 0 # In case values and text is not the same
|
||||
for i in range(len(self._text)): # pylint: disable=consider-using-enumerate
|
||||
for i in range(len(self._text)):
|
||||
if (not self._text[i]["is_data"]) or (value_index > (len(values) - 1)):
|
||||
continue
|
||||
string = None
|
||||
|
|
@ -478,7 +474,7 @@ class PortalBase:
|
|||
string = func(values[value_index])
|
||||
else:
|
||||
try:
|
||||
string = "{:,d}".format(int(values[value_index]))
|
||||
string = f"{int(values[value_index]):,d}"
|
||||
except (TypeError, ValueError):
|
||||
string = values[value_index] # ok it's a string
|
||||
self._fetch_set_text(string, index=i)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ Implementation Notes
|
|||
"""
|
||||
|
||||
import gc
|
||||
|
||||
import displayio
|
||||
|
||||
__version__ = "0.0.0+auto.0"
|
||||
|
|
@ -40,8 +41,7 @@ class GraphicsBase:
|
|||
|
||||
"""
|
||||
|
||||
# pylint: disable=too-many-instance-attributes, too-many-locals, too-many-branches, too-many-statements
|
||||
def __init__(self, display, *, default_bg=0x000000, scale=1, debug=False):
|
||||
def __init__(self, display, *, default_bg=0x000000, scale=1, debug=False): # noqa: PLR0912,PLR0913 Too many branches,Too many arguments in function definition
|
||||
self._debug = debug
|
||||
self.display = display
|
||||
|
||||
|
|
@ -100,9 +100,7 @@ class GraphicsBase:
|
|||
self._bg_group.append(self._bg_sprite)
|
||||
gc.collect()
|
||||
|
||||
def qrcode(
|
||||
self, qr_data, *, qr_size=1, x=0, y=0, qr_color=0x000000
|
||||
): # pylint: disable=invalid-name
|
||||
def qrcode(self, qr_data, *, qr_size=1, x=0, y=0, qr_color=0x000000): # noqa: PLR0912,PLR0913 Too many branches,Too many arguments in function definition
|
||||
"""Display a QR code
|
||||
|
||||
:param qr_data: The data for the QR code, None to remove.
|
||||
|
|
@ -118,7 +116,7 @@ class GraphicsBase:
|
|||
gc.collect()
|
||||
return
|
||||
|
||||
import adafruit_miniqr # pylint: disable=import-outside-toplevel
|
||||
import adafruit_miniqr
|
||||
|
||||
# generate the QR code
|
||||
for qrtype in range(1, 6):
|
||||
|
|
@ -137,7 +135,6 @@ class GraphicsBase:
|
|||
palette[0] = 0xFFFFFF
|
||||
palette[1] = qr_color
|
||||
|
||||
# pylint: disable=invalid-name
|
||||
# bitmap the size of the matrix, plus border, monochrome (2 colors)
|
||||
qr_bitmap = displayio.Bitmap(
|
||||
qrcode.matrix.width + 2, qrcode.matrix.height + 2, 2
|
||||
|
|
|
|||
|
|
@ -21,12 +21,13 @@ Implementation Notes
|
|||
|
||||
"""
|
||||
|
||||
import gc
|
||||
import os
|
||||
import time
|
||||
import gc
|
||||
from micropython import const
|
||||
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
|
||||
|
||||
from adafruit_fakerequests import Fake_Requests
|
||||
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
|
||||
from micropython import const
|
||||
|
||||
try:
|
||||
import rtc
|
||||
|
|
@ -36,7 +37,6 @@ except ImportError:
|
|||
__version__ = "0.0.0+auto.0"
|
||||
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PortalBase.git"
|
||||
|
||||
# pylint: disable=line-too-long, too-many-lines, too-many-public-methods
|
||||
# you'll need to pass in an io username and key
|
||||
TIME_SERVICE = (
|
||||
"https://io.adafruit.com/api/v2/%s/integrations/time/strftime?x-aio-key=%s"
|
||||
|
|
@ -45,7 +45,6 @@ TIME_SERVICE = (
|
|||
# See https://apidock.com/ruby/DateTime/strftime for full options
|
||||
TIME_SERVICE_FORMAT = "%Y-%m-%d %H:%M:%S.%L %j %u %z %Z"
|
||||
LOCALFILE = "local.txt"
|
||||
# pylint: enable=line-too-long
|
||||
|
||||
STATUS_NO_CONNECTION = (100, 0, 0) # Red
|
||||
STATUS_CONNECTING = (0, 0, 100) # Blue
|
||||
|
|
@ -90,8 +89,7 @@ class NetworkBase:
|
|||
|
||||
"""
|
||||
|
||||
# pylint: disable=too-many-instance-attributes, too-many-locals, too-many-branches, too-many-statements
|
||||
def __init__(
|
||||
def __init__( # noqa: PLR0912,PLR0913 Too many branches,Too many arguments in function definition
|
||||
self, wifi_module, *, extract_values=True, debug=False, secrets_data=None
|
||||
):
|
||||
self._wifi = wifi_module
|
||||
|
|
@ -108,7 +106,7 @@ class NetworkBase:
|
|||
if secrets_data is not None:
|
||||
for key, value in secrets_data.items():
|
||||
if key in OLD_SETTINGS:
|
||||
key = OLD_SETTINGS.get(key)
|
||||
key = OLD_SETTINGS.get(key) # noqa: PLW2901 `for` loop variable `value` overwritten by assignment target
|
||||
self._settings[key] = value
|
||||
self._wifi_credentials = None
|
||||
|
||||
|
|
@ -134,7 +132,7 @@ class NetworkBase:
|
|||
if os.getenv(setting_name) is not None:
|
||||
return os.getenv(setting_name)
|
||||
try:
|
||||
from secrets import secrets # pylint: disable=import-outside-toplevel
|
||||
from secrets import secrets
|
||||
except ImportError:
|
||||
secrets = {}
|
||||
if old_setting_name in secrets.keys():
|
||||
|
|
@ -210,7 +208,6 @@ class NetworkBase:
|
|||
:param str location: Your city and country, e.g. ``"America/New_York"``.
|
||||
|
||||
"""
|
||||
# pylint: disable=line-too-long
|
||||
self.connect()
|
||||
api_url = None
|
||||
reply = None
|
||||
|
|
@ -219,7 +216,7 @@ class NetworkBase:
|
|||
aio_key = self._get_setting("AIO_KEY")
|
||||
except KeyError:
|
||||
raise KeyError(
|
||||
"\n\nOur time service requires a login/password to rate-limit. Please register for a free adafruit.io account and place the user/key in your secrets file under 'AIO_USERNAME' and 'AIO_KEY'" # pylint: disable=line-too-long
|
||||
"\n\nOur time service requires a login/password to rate-limit. Please register for a free adafruit.io account and place the user/key in your secrets file under 'AIO_USERNAME' and 'AIO_KEY'"
|
||||
) from KeyError
|
||||
|
||||
if location is None:
|
||||
|
|
@ -250,7 +247,7 @@ class NetworkBase:
|
|||
reply = response.text
|
||||
except KeyError:
|
||||
raise KeyError(
|
||||
"Was unable to lookup the time, try setting secrets['timezone'] according to http://worldtimeapi.org/timezones" # pylint: disable=line-too-long
|
||||
"Was unable to lookup the time, try setting secrets['timezone'] according to http://worldtimeapi.org/timezones"
|
||||
) from KeyError
|
||||
# now clean up
|
||||
response.close()
|
||||
|
|
@ -260,7 +257,6 @@ class NetworkBase:
|
|||
return reply
|
||||
|
||||
def get_local_time(self, location=None):
|
||||
# pylint: disable=line-too-long
|
||||
"""
|
||||
Fetch and "set" the local time of this microcontroller to the local time at the location, using an internet time API.
|
||||
|
||||
|
|
@ -275,9 +271,9 @@ class NetworkBase:
|
|||
year_day = int(times[2])
|
||||
week_day = int(times[3])
|
||||
is_dst = None # no way to know yet
|
||||
year, month, mday = [int(x) for x in the_date.split("-")]
|
||||
year, month, mday = (int(x) for x in the_date.split("-"))
|
||||
the_time = the_time.split(".")[0]
|
||||
hours, minutes, seconds = [int(x) for x in the_time.split(":")]
|
||||
hours, minutes, seconds = (int(x) for x in the_time.split(":"))
|
||||
now = time.struct_time(
|
||||
(year, month, mday, hours, minutes, seconds, week_day, year_day, is_dst)
|
||||
)
|
||||
|
|
@ -623,7 +619,7 @@ class NetworkBase:
|
|||
gc.collect()
|
||||
return headers
|
||||
|
||||
def fetch_data(
|
||||
def fetch_data( # noqa: PLR0913 Too many arguments in function definition
|
||||
self,
|
||||
url,
|
||||
*,
|
||||
|
|
@ -672,9 +668,7 @@ class NetworkBase:
|
|||
print("Couldn't parse json: ", response.text)
|
||||
raise
|
||||
except MemoryError as error:
|
||||
raise MemoryError(
|
||||
"{} (data is likely too large)".format(error)
|
||||
) from error
|
||||
raise MemoryError(f"{error} (data is likely too large)") from error
|
||||
|
||||
if content_type == CONTENT_JSON:
|
||||
values = self.process_json(json_out, json_path)
|
||||
|
|
@ -703,7 +697,7 @@ class NetworkBase:
|
|||
"""
|
||||
values = []
|
||||
if regexp_path:
|
||||
import re # pylint: disable=import-outside-toplevel
|
||||
import re
|
||||
|
||||
for regexp in regexp_path:
|
||||
values.append(re.search(regexp, text).group(1))
|
||||
|
|
@ -740,7 +734,7 @@ class NetworkBase:
|
|||
raise
|
||||
else:
|
||||
# No path given, so return JSON as string for compatibility
|
||||
import json # pylint: disable=import-outside-toplevel
|
||||
import json
|
||||
|
||||
values = json.dumps(json_data)
|
||||
return values
|
||||
|
|
|
|||
|
|
@ -21,11 +21,12 @@ Implementation Notes
|
|||
"""
|
||||
|
||||
import gc
|
||||
import board
|
||||
from digitalio import DigitalInOut
|
||||
from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
|
||||
|
||||
import adafruit_connection_manager
|
||||
import adafruit_requests
|
||||
import board
|
||||
from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
|
||||
from digitalio import DigitalInOut
|
||||
|
||||
__version__ = "0.0.0+auto.0"
|
||||
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PortalBase.git"
|
||||
|
|
|
|||
|
|
@ -23,9 +23,10 @@ Implementation Notes
|
|||
|
||||
import gc
|
||||
import ssl
|
||||
import wifi
|
||||
import socketpool
|
||||
|
||||
import adafruit_requests
|
||||
import socketpool
|
||||
import wifi
|
||||
|
||||
__version__ = "0.0.0+auto.0"
|
||||
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PortalBase.git"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
import datetime
|
||||
import os
|
||||
import sys
|
||||
import datetime
|
||||
|
||||
sys.path.insert(0, os.path.abspath(".."))
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ See MatrixPortal, MagTag, and PyPortal libraries for more examples.
|
|||
# NOTE: Make sure you've created your secrets.py file before running this example
|
||||
# https://learn.adafruit.com/adafruit-pyportal/internet-connect#whats-a-secrets-file-17-2
|
||||
|
||||
|
||||
import board
|
||||
import displayio
|
||||
from adafruit_pyportal import PyPortal
|
||||
|
|
|
|||
|
|
@ -41,6 +41,16 @@ classifiers = [
|
|||
]
|
||||
dynamic = ["dependencies", "optional-dependencies"]
|
||||
|
||||
[tool.ruff]
|
||||
target-version = "py38"
|
||||
|
||||
[tool.ruff.lint]
|
||||
select = ["I", "PL", "UP"]
|
||||
ignore = ["PLR2004", "UP030"]
|
||||
|
||||
[tool.ruff.format]
|
||||
line-ending = "lf"
|
||||
|
||||
[tool.setuptools]
|
||||
packages = ["adafruit_portalbase"]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue