Merge branch 'main' into dev/add_type_annotations

# Conflicts:
#	adafruit_turtle.py

Author: FoamyGuy

.pre-commit-config.yaml

@@ -4,21 +4,21 @@
 
 repos:
   - repo: https://github.com/python/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
   - repo: https://github.com/fsfe/reuse-tool
-    rev: v0.14.0
+    rev: v1.1.2
     hooks:
       - id: reuse
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.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.15.5
+    rev: v2.17.4
     hooks:
       - id: pylint
         name: pylint (library code)

.pylintrc

@@ -396,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

adafruit_turtle.py

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: 2021 Dave Astels for Adafruit Industries
 #
 # SPDX-License-Identifier: MIT
+
 """
 `adafruit_turtle`
 ================================================================================

docs/conf.py

@@ -17,6 +17,7 @@
 # ones.
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinxcontrib.jquery",
     "sphinx.ext.intersphinx",
     "sphinx.ext.napoleon",
     "sphinx.ext.todo",

docs/requirements.txt

@@ -3,3 +3,4 @@
 # SPDX-License-Identifier: Unlicense
 
 sphinx>=4.0.0
+sphinxcontrib-jquery

examples/turtle_koch.py

@@ -8,22 +8,23 @@
 
 
 def f(side_length, depth, generation):
-    if depth != 0:
-        side = lambda: f(side_length / 3, depth - 1, generation + 1)
-        side()
-        turtle.left(60)
-        side()
-        turtle.right(120)
-        side()
-        turtle.left(60)
-        side()
+    if depth == 0:
+        turtle.forward(side_length)
+        return
+    side = lambda: f(side_length / 3, depth - 1, generation + 1)
+    side()
+    turtle.left(60)
+    side()
+    turtle.right(120)
+    side()
+    turtle.left(60)
+    side()
 
 
 turtle = turtle(board.DISPLAY)
 
 unit = min(board.DISPLAY.width / 3, board.DISPLAY.height / 4)
 top_len = unit * 3
-print(top_len)
 turtle.penup()
 turtle.goto(-1.5 * unit, unit)
 turtle.pendown()

examples/turtle_overlayed_koch.py

@@ -6,19 +6,21 @@
 import board
 from adafruit_turtle import turtle, Color
 
-generation_colors = [Color.RED, Color.BLUE, Color.GREEN]
+generation_colors = [Color.RED, Color.BLUE, Color.GREEN, Color.YELLOW]
 
 
 def f(side_length, depth, generation):
-    if depth != 0:
-        side = lambda: f(side_length / 3, depth - 1, generation + 1)
-        side()
-        turtle.left(60)
-        side()
-        turtle.right(120)
-        side()
-        turtle.left(60)
-        side()
+    if depth == 0:
+        turtle.forward(side_length)
+        return
+    side = lambda: f(side_length / 3, depth - 1, generation + 1)
+    side()
+    turtle.left(60)
+    side()
+    turtle.right(120)
+    side()
+    turtle.left(60)
+    side()
 
 
 def snowflake(num_generations, generation_color):
@@ -42,7 +44,7 @@ def snowflake(num_generations, generation_color):
 turtle.goto(-1.5 * unit, unit)
 turtle.pendown()
 
-for generations in range(3):
+for generations in range(4):
     snowflake(generations, generation_colors[generations])
     turtle.right(120)
 

examples/turtle_sierpinski.py

@@ -10,7 +10,6 @@ def getMid(p1, p2):
 
 
 def triangle(points, depth):
-
     turtle.penup()
     turtle.goto(points[0][0], points[0][1])
     turtle.pendown()