From 10e202d4ccd117b27a8763d37d22462a83d60fa4 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 7 Sep 2023 16:26:56 -0700 Subject: [PATCH 1/6] Add issue templates and update prec-ommit config --- .github/ISSUE_TEMPLATE/bug_report.yml | 50 +++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 11 +++++ .github/ISSUE_TEMPLATE/feature_request.md | 15 +++++++ .github/ISSUE_TEMPLATE/new_board_request.md | 15 +++++++ .pre-commit-config.yaml | 9 ++-- src/board.py | 5 ++- 6 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/new_board_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 00000000..3e24c9c8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,50 @@ +# SPDX-FileCopyrightText: 2023 Melissa LeBlanc-Williams for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +name: 🐞 Bug Report +description: Create a bug report to help us improve +labels: + - bug +body: + - type: markdown + attributes: + value: >- + Thanks for taking the time to fill out this bug report! + Now that you have encountered a bug... you can file a report for it. + - type: input + id: board + attributes: + label: Board Name + description: Which board are you using? + placeholder: e.g. Raspberry Pi 4 + validations: + required: false + - type: textarea + id: steps + attributes: + label: Steps + description: Please mention the steps needed to replicate the issue. + placeholder: | + 1. SSH into the board... + 2. Enter the following folder... + 3. Run the following command... + validations: + required: true + - type: textarea + id: description + attributes: + label: Description + description: Optionally, describe the bug in more detail. + placeholder: | + - Error while using... + - Only happens when... + - Might be related to #64... + - type: textarea + id: more-info + attributes: + label: Additional information + description: >- + Optionally, add any other information like screenshot of the page. + If you have already done some debugging, mention it here. + If you have some code or logs, you can paste it here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..95212747 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,11 @@ +# SPDX-FileCopyrightText: 2023 Melissa LeBlanc-Williams for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +contact_links: + - name: 🔗 Adafruit Forum + url: https://forums.adafruit.com/ + about: Official Adafruit technical support forum. Good for getting help on getting a project working. + - name: 🔗 Adafruit Discord + url: https://adafru.it/discord + about: Unofficial chat with many helpful folks and normally prompt replies. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..479fb857 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,15 @@ + +--- +name: 🚀 Feature Request +about: Suggest an idea for this project +title: '' +labels: 'enhancement' +assignees: '' + +--- + + diff --git a/.github/ISSUE_TEMPLATE/new_board_request.md b/.github/ISSUE_TEMPLATE/new_board_request.md new file mode 100644 index 00000000..f3658d5a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/new_board_request.md @@ -0,0 +1,15 @@ + +--- +name: 🚀 New Board Request +about: Request Support for a New Board +title: '' +labels: 'New Board Request' +assignees: '' + +--- + + diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 08256d87..033f2594 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,22 +4,21 @@ repos: - repo: https://github.com/python/black - rev: 22.3.0 + rev: 23.3.0 hooks: - id: black - additional_dependencies: ['click==8.0.4'] - repo: https://github.com/fsfe/reuse-tool - rev: v0.12.1 + rev: v1.1.2 hooks: - id: reuse - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 + rev: v4.4.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/pycqa/pylint - rev: v2.11.1 + rev: v2.17.4 hooks: - id: pylint name: pylint (library code) diff --git a/src/board.py b/src/board.py index b7775d73..3c18c18f 100644 --- a/src/board.py +++ b/src/board.py @@ -358,8 +358,11 @@ f""" {package[0]} version {package[1]} was unable to identify the board and/or microcontroller running the {platform.system()} platform. Please be sure you - have the latest packages running: + have the latest packages by running: 'pip3 install --upgrade adafruit-blinka adafruit-platformdetect' + + If you are running the latest package, your board may not yet be supported. Please + open a New Issue on GitHub: https://github.com/adafruit/Adafruit_Blinka/issues """ ) From 2f8ca92d40677ad56d86d6f87ac38311159f496b Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 7 Sep 2023 16:29:09 -0700 Subject: [PATCH 2/6] Update message to point to new template --- src/board.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/board.py b/src/board.py index 3c18c18f..0c68fe33 100644 --- a/src/board.py +++ b/src/board.py @@ -362,7 +362,8 @@ 'pip3 install --upgrade adafruit-blinka adafruit-platformdetect' If you are running the latest package, your board may not yet be supported. Please - open a New Issue on GitHub: https://github.com/adafruit/Adafruit_Blinka/issues + open a New Issue on GitHub at https://github.com/adafruit/Adafruit_Blinka/issues and + select New Board Request. """ ) From 69fe9dca75103fbf2470916dff1893b7bc91d55f Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 7 Sep 2023 16:32:07 -0700 Subject: [PATCH 3/6] Update Feature Request message --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 479fb857..4393365b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -11,5 +11,5 @@ assignees: '' --- - From 1530cf9cbfb008ff6a7e54e695dcb5a34f95d5a4 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Fri, 8 Sep 2023 09:38:31 -0700 Subject: [PATCH 4/6] Updated pylint config and linted everything --- .pylintrc | 55 +++---------------- .../microcontroller/am335x/sysfs_pwmout.py | 1 + .../amlogic/a311d/pulseio/PulseIn.py | 2 + .../meson_g12_common/pulseio/PulseIn.py | 2 + .../bcm283x/pulseio/PulseIn.py | 2 + .../microcontroller/ftdi_mpsse/mpsse/spi.py | 1 + .../generic_linux/libgpiod_pin.py | 1 + .../generic_linux/sysfs_pin.py | 1 + .../generic_micropython/spi.py | 1 + .../microcontroller/nova/__init__.py | 4 +- .../microcontroller/nxp_lpc4330/pwmout.py | 1 + .../microcontroller/rp2040/spi.py | 1 + .../microcontroller/rp2040/uart.py | 1 + src/digitalio.py | 2 +- src/microcontroller/__init__.py | 2 +- src/microcontroller/pin.py | 2 +- src/usb_hid.py | 2 +- test/src/testing/universal/i2c.py | 1 - 18 files changed, 30 insertions(+), 52 deletions(-) diff --git a/.pylintrc b/.pylintrc index 0267cf0a..eab7cc0a 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries # # SPDX-License-Identifier: Unlicense + [MASTER] # A comma-separated list of package or module names from where C extensions may @@ -8,11 +9,11 @@ # run arbitrary code extension-pkg-whitelist=hid -# Add files or directories to the blacklist. They should be base names, not +# 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 blacklist. The +# Add files or directories matching the regex patterns to the ignore-list. The # regex matches against base names, not paths. ignore-patterns= @@ -22,11 +23,10 @@ ignore-patterns= # Use multiple processes to speed up Pylint. jobs=1 -# jobs=2 # List of plugins (as comma separated values of python modules names) to load, # usually to register additional checkers. -load-plugins= +load-plugins=pylint.extensions.no_self_use # Pickle collected data for later comparisons. persistent=yes @@ -54,8 +54,8 @@ confidence= # --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,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 -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,invalid-name +# 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,import-outside-toplevel,too-many-branches,too-many-statements,too-many-public-methods,invalid-name # 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 @@ -225,12 +225,6 @@ max-line-length=100 # Maximum number of lines in a module max-module-lines=1000 -# List of optional constructs for which whitespace checking is disabled. `dict- -# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. -# `trailing-comma` allows a space between comma and closing bracket: (a, ). -# `empty-line` allows space-only lines. -no-space-check=trailing-comma,dict-separator - # 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 @@ -249,46 +243,30 @@ ignore-comments=yes ignore-docstrings=yes # Ignore imports when computing similarities. -ignore-imports=no +ignore-imports=yes # Minimum lines number of a similarity. -min-similarity-lines=80 +min-similarity-lines=12 [BASIC] -# Naming hint for argument names -argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct argument names argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ -# Naming hint for attribute names -attr-name-hint=(([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 -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - # Regular expression matching correct class attribute names class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -# Naming hint for class names -# class-name-hint=[A-Z_][a-zA-Z0-9]+$ -class-name-hint=[A-Z_][a-zA-Z0-9_]+$ - # Regular expression matching correct class names # class-rgx=[A-Z_][a-zA-Z0-9]+$ class-rgx=[A-Z_][a-zA-Z0-9_]+$ -# Naming hint for constant names -const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - # Regular expression matching correct constant names const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ @@ -296,9 +274,6 @@ const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ # ones are exempt. docstring-min-length=-1 -# Naming hint for function names -function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct function names function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ @@ -309,21 +284,12 @@ 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 -# Naming hint for inline iteration names -inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ - # Regular expression matching correct inline iteration names inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ -# Naming hint for method names -method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct method names method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ -# Naming hint for module names -module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - # Regular expression matching correct module names module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ @@ -339,9 +305,6 @@ no-docstring-rgx=^_ # to this list to register other decorators that produce valid properties. property-classes=abc.abstractproperty -# Naming hint for variable names -variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct variable names variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ @@ -433,4 +396,4 @@ min-public-methods=1 # Exceptions that will emit a warning when being caught. Defaults to # "Exception" -overgeneral-exceptions=Exception +overgeneral-exceptions=builtins.Exception diff --git a/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py index 776f9bb4..dd96c53b 100644 --- a/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py +++ b/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py @@ -14,6 +14,7 @@ except ImportError: raise RuntimeError("No PWM outputs defined for this board") from ImportError + # pylint: disable=unnecessary-pass class PWMError(IOError): """Base class for PWM errors.""" diff --git a/src/adafruit_blinka/microcontroller/amlogic/a311d/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/amlogic/a311d/pulseio/PulseIn.py index caf0d62b..4f7ae362 100644 --- a/src/adafruit_blinka/microcontroller/amlogic/a311d/pulseio/PulseIn.py +++ b/src/adafruit_blinka/microcontroller/amlogic/a311d/pulseio/PulseIn.py @@ -14,6 +14,7 @@ queues = [] procs = [] + # The message queues live outside of python space, and must be formally cleaned! def final(): """In case the program is cancelled or quit, we need to clean up the PulseIn @@ -29,6 +30,7 @@ def final(): atexit.register(final) + # pylint: disable=c-extension-no-member class PulseIn: """PulseIn Class to read PWM signals""" diff --git a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pulseio/PulseIn.py index ae82f1cc..73397add 100644 --- a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pulseio/PulseIn.py +++ b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pulseio/PulseIn.py @@ -13,6 +13,7 @@ queues = [] procs = [] + # The message queues live outside of python space, and must be formally cleaned! def final(): """In case the program is cancelled or quit, we need to clean up the PulseIn @@ -28,6 +29,7 @@ def final(): atexit.register(final) + # pylint: disable=c-extension-no-member class PulseIn: """PulseIn Class to read PWM signals""" diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py index caf0d62b..4f7ae362 100644 --- a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py +++ b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py @@ -14,6 +14,7 @@ queues = [] procs = [] + # The message queues live outside of python space, and must be formally cleaned! def final(): """In case the program is cancelled or quit, we need to clean up the PulseIn @@ -29,6 +30,7 @@ def final(): atexit.register(final) + # pylint: disable=c-extension-no-member class PulseIn: """PulseIn Class to read PWM signals""" diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py index 66bb8fd2..d5f1e917 100644 --- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py +++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py @@ -8,6 +8,7 @@ get_ft2232h_url, ) + # pylint: disable=protected-access class SPI: """Custom SPI Class for FTDI MPSSE""" diff --git a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py index a5a51726..0bb89beb 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py @@ -10,6 +10,7 @@ "https://github.com/adafruit/Raspberry-Pi-Installer-Scripts/blob/master/libgpiod.sh" ) from ImportError + # pylint: disable=too-many-branches,too-many-statements class Pin: """Pins dont exist in CPython so...lets make our own!""" diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py index 8ce1a65c..86c9a5fd 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py @@ -11,6 +11,7 @@ import errno import time + # pylint: disable=unnecessary-pass class GPIOError(IOError): """Base class for GPIO errors.""" diff --git a/src/adafruit_blinka/microcontroller/generic_micropython/spi.py b/src/adafruit_blinka/microcontroller/generic_micropython/spi.py index b8979515..ce20d044 100755 --- a/src/adafruit_blinka/microcontroller/generic_micropython/spi.py +++ b/src/adafruit_blinka/microcontroller/generic_micropython/spi.py @@ -4,6 +4,7 @@ """SPI Class for Generic MicroPython""" from machine import SPI as _SPI + # pylint: disable=protected-access, no-self-use class SPI: """SPI Class for Generic MicroPython""" diff --git a/src/adafruit_blinka/microcontroller/nova/__init__.py b/src/adafruit_blinka/microcontroller/nova/__init__.py index 48463707..d6ab78cf 100644 --- a/src/adafruit_blinka/microcontroller/nova/__init__.py +++ b/src/adafruit_blinka/microcontroller/nova/__init__.py @@ -19,7 +19,9 @@ def getInstance(): def __init__(self): """Virtually private constructor.""" if Connection.__instance is not None: - raise Exception("This class is a singleton!") + raise Exception( # pylint: disable=broad-exception-raised + "This class is a singleton!" + ) # pylint: disable=import-outside-toplevel from binhoHostAdapter import binhoHostAdapter diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py index cab12589..cc671847 100644 --- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py +++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py @@ -10,6 +10,7 @@ except ImportError: raise RuntimeError("No PWM outputs defined for this board") from ImportError + # pylint: disable=unnecessary-pass class PWMError(IOError): """Base class for PWM errors.""" diff --git a/src/adafruit_blinka/microcontroller/rp2040/spi.py b/src/adafruit_blinka/microcontroller/rp2040/spi.py index 4480a883..bf59dd79 100644 --- a/src/adafruit_blinka/microcontroller/rp2040/spi.py +++ b/src/adafruit_blinka/microcontroller/rp2040/spi.py @@ -6,6 +6,7 @@ from machine import Pin from microcontroller.pin import spiPorts + # pylint: disable=protected-access, no-self-use class SPI: """Custom SPI Class for RP2040""" diff --git a/src/adafruit_blinka/microcontroller/rp2040/uart.py b/src/adafruit_blinka/microcontroller/rp2040/uart.py index 61c93ce3..22642efd 100644 --- a/src/adafruit_blinka/microcontroller/rp2040/uart.py +++ b/src/adafruit_blinka/microcontroller/rp2040/uart.py @@ -6,6 +6,7 @@ from machine import Pin from microcontroller.pin import uartPorts + # pylint: disable=protected-access, no-self-use class UART: """Custom UART Class for RP2040""" diff --git a/src/digitalio.py b/src/digitalio.py index 62e61a47..b987c207 100644 --- a/src/digitalio.py +++ b/src/digitalio.py @@ -21,7 +21,7 @@ from adafruit_blinka.microcontroller.am335x.pin import Pin elif detector.chip.AM65XX: from adafruit_blinka.microcontroller.am65xx.pin import Pin -elif detector.chip.JH71x0: +elif detector.chip.JH71X0: from adafruit_blinka.microcontroller.starfive.JH71x0.pin import Pin elif detector.chip.DRA74X: from adafruit_blinka.microcontroller.dra74x.pin import Pin diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index 37cd3a60..baf06cd7 100644 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -46,7 +46,7 @@ def delay_us(delay): from adafruit_blinka.microcontroller.am335x import * elif chip_id == ap_chip.AM65XX: from adafruit_blinka.microcontroller.am65xx import * -elif chip_id == ap_chip.JH71x0: +elif chip_id == ap_chip.JH71X0: from adafruit_blinka.microcontroller.starfive.JH71x0 import * elif chip_id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner.h3 import * diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py index 2fe19a62..fdbced46 100644 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@ -31,7 +31,7 @@ from adafruit_blinka.microcontroller.am335x.pin import * elif chip_id == ap_chip.AM65XX: from adafruit_blinka.microcontroller.am65xx.pin import * -elif chip_id == ap_chip.JH71x0: +elif chip_id == ap_chip.JH71X0: from adafruit_blinka.microcontroller.starfive.JH71x0.pin import * elif chip_id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner.h3.pin import * diff --git a/src/usb_hid.py b/src/usb_hid.py index 38e19b19..791647b2 100644 --- a/src/usb_hid.py +++ b/src/usb_hid.py @@ -19,7 +19,7 @@ for module in ["dwc2", "libcomposite"]: if Path("/proc/modules").read_text(encoding="utf-8").find(module) == -1: - raise Exception( + raise Exception( # pylint: disable=broad-exception-raised "%s module not present in your kernel. did you insmod it?" % module ) this = sys.modules[__name__] diff --git a/test/src/testing/universal/i2c.py b/test/src/testing/universal/i2c.py index 0a3e478d..b30a9458 100644 --- a/test/src/testing/universal/i2c.py +++ b/test/src/testing/universal/i2c.py @@ -15,7 +15,6 @@ class TestBME280Interactive(TestCase): def test_read_value(self): - import board gc.collect() From 30efc150e086afea90d11fcc07fe360d367b9e6e Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Fri, 8 Sep 2023 10:07:35 -0700 Subject: [PATCH 5/6] Bump platformdetect requirement --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 329c2f0c..e6eb339a 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Adafruit-PlatformDetect>=3.13.0 +Adafruit-PlatformDetect>=3.52.0 Adafruit-PureIO>=1.1.7 Jetson.GPIO; platform_machine=='aarch64' RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l' From 1a596619f966cda112d1394735d268be887cf6a8 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Fri, 8 Sep 2023 10:09:35 -0700 Subject: [PATCH 6/6] Bump platformdetect requirement in setup --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c94ab3cb..aa644980 100755 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ }, include_package_data=True, install_requires=[ - "Adafruit-PlatformDetect>=3.13.0", + "Adafruit-PlatformDetect>=3.52.0", "Adafruit-PureIO>=1.1.7", "pyftdi>=0.40.0", "adafruit-circuitpython-typing",