From 5df183365f5ea5f6ce522a760c65ae10ba87589e Mon Sep 17 00:00:00 2001
From: Jess Frazelle <github@jessfraz.com>
Date: Tue, 10 Sep 2024 15:47:12 -0700
Subject: [PATCH] format

Signed-off-by: Jess Frazelle <github@jessfraz.com>
---
 .github/workflows/black.yml                   | 34 -------------------
 .github/workflows/ruff.yml                    |  1 +
 Dockerfile                                    |  1 -
 Makefile                                      |  2 +-
 .../websocket_tutorial/websocketexample.py    |  2 --
 5 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/black.yml

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
deleted file mode 100644
index 9b75072..0000000
--- a/.github/workflows/black.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: black
-on:
-  push:
-    branches: main
-    paths:
-      - '**.py'
-      - .github/workflows/black.yml
-      - 'pyproject.toml'
-      - 'requirements.txt'
-  pull_request:
-    paths:
-      - '**.py'
-      - .github/workflows/black.yml
-      - 'pyproject.toml'
-      - 'requirements.txt'
-jobs:
-  black:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-
-      # Installation instructions are from: https://python-poetry.org/docs/
-      - name: Install dependencies
-        shell: bash
-        run: |
-          pip install \
-          black
-
-      - name: Run black
-        shell: bash
-        run: |
-          black --check --diff . */*/*.py
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 56eee4a..caadbd3 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -32,3 +32,4 @@ jobs:
         shell: bash
         run: |
           ruff check --output-format=github . */*/*.py
+          ruff format --check
diff --git a/Dockerfile b/Dockerfile
index eb18b89..e1e5fb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 FROM python:3.9
 
 RUN pip install \
-		black \
 		isort \
 		mypy \
 		ruff
diff --git a/Makefile b/Makefile
index 29767d8..224c38f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ format: docker-image ## Format all the python files.
 		--disable-content-trust \
 		-v $(CURDIR):/home/user/src \
 		--workdir /home/user/src \
-		$(DOCKER_IMAGE_NAME) sh -c 'isort . */*/*.py && black . */*/*.py && ruff check --fix . */*/*.py'
+		$(DOCKER_IMAGE_NAME) sh -c 'isort . */*/*.py && ruff format && ruff check --fix . */*/*.py'
 
 .PHONY: shell
 shell: docker-image ## Pop into a shell in the docker image.
diff --git a/tutorials/websocket_tutorial/websocketexample.py b/tutorials/websocket_tutorial/websocketexample.py
index 51ddb95..50392b3 100644
--- a/tutorials/websocket_tutorial/websocketexample.py
+++ b/tutorials/websocket_tutorial/websocketexample.py
@@ -19,7 +19,6 @@
 
 
 def make_cube():
-
     # Create our client.
     client = ClientFromEnv()
 
@@ -37,7 +36,6 @@ def make_cube():
         video_res_width=480,
         webrtc=False,
     ) as websocket:
-
         # Draw a sqaure
 
         # Start the Path