Merge branch 'main' into dependabot/pip/kittycad-0.6.24

* main: format
KittyCAD · Sep 10, 2024 · 59e5cbb · 59e5cbb
2 parents 44c9ce0 + 5df1833
commit 59e5cbb
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 38 deletions.
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
diff --git 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
@@ -1,7 +1,6 @@
 FROM python:3.9
 
 RUN pip install \
-		black \
 		isort \
 		mypy \
 		ruff

diff --git 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
@@ -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