Skip to content

Commit a39d458

Browse files
author
BiffoBear
committed
Merge changes to main.
2 parents 1a46101 + 0fa1ca9 commit a39d458

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
repos:
66
- repo: https://github.com/python/black
7-
rev: 22.3.0
7+
rev: 23.3.0
88
hooks:
99
- id: black
1010
- repo: https://github.com/fsfe/reuse-tool
11-
rev: v0.14.0
11+
rev: v1.1.2
1212
hooks:
1313
- id: reuse
1414
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v4.2.0
15+
rev: v4.4.0
1616
hooks:
1717
- id: check-yaml
1818
- id: end-of-file-fixer
1919
- id: trailing-whitespace
2020
- repo: https://github.com/pycqa/pylint
21-
rev: v2.15.5
21+
rev: v2.17.4
2222
hooks:
2323
- id: pylint
2424
name: pylint (library code)

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,4 +396,4 @@ min-public-methods=1
396396

397397
# Exceptions that will emit a warning when being caught. Defaults to
398398
# "Exception"
399-
overgeneral-exceptions=Exception
399+
overgeneral-exceptions=builtins.Exception

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@ def _parse_dhcp_response(
599599
matches, a client ID exists and the 'magic cookie' is set. If any of these tests
600600
fail or no message type is found in the options, raises a ValueError.
601601
"""
602+
602603
# pylint: disable=too-many-branches
603604
def option_reader(pointer: int) -> Tuple[int, int, bytes]:
604605
"""Helper function to extract DHCP option data from a

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# ones.
1818
extensions = [
1919
"sphinx.ext.autodoc",
20+
"sphinxcontrib.jquery",
2021
"sphinx.ext.intersphinx",
2122
"sphinx.ext.napoleon",
2223
"sphinx.ext.todo",

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
# SPDX-License-Identifier: Unlicense
44

55
sphinx>=4.0.0
6+
sphinxcontrib-jquery

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ classifiers = [
4343
dynamic = ["dependencies", "optional-dependencies"]
4444

4545
[tool.setuptools]
46-
py-modules = ["adafruit_wiznet5k"]
46+
packages = ["adafruit_wiznet5k"]
4747

4848
[tool.setuptools.dynamic]
4949
dependencies = {file = ["requirements.txt"]}

tests/test_dhcp_helper_functions.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,6 @@ def test_bad_message_non_blocking_renewing(
641641

642642

643643
class TestReceiveResponse:
644-
645644
minimum_packet_length = 236
646645

647646
@freeze_time("2022-10-10")

0 commit comments

Comments
 (0)