Merge remote-tracking branch 'base-origin/master' into reload-options

emmett-framework · Aug 1, 2024 · 4c5098e · 4c5098e
2 parents b7d8581 + d95b210
commit 4c5098e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.pyc
 __pycache__
 
+.idea/
 *.sublime-*
 .venv
 .vscode

diff --git a/Makefile b/Makefile
@@ -8,13 +8,13 @@ build-dev:
 
 .PHONY: format
 format:
-	ruff --fix $(pysources)
+	ruff check --fix $(pysources)
 	ruff format $(pysources)
 	cargo fmt
 
 .PHONY: lint-python
 lint-python:
-	ruff $(pysources)
+	ruff check $(pysources)
 	ruff format --check $(pysources)
 
 .PHONY: lint-rust

diff --git a/granian/errors.py b/granian/errors.py
@@ -1,10 +1,7 @@
-class FatalError(Exception):
-    ...
+class FatalError(Exception): ...
 
 
-class ConfigurationError(FatalError):
-    ...
+class ConfigurationError(FatalError): ...
 
 
-class PidFileError(FatalError):
-    ...
+class PidFileError(FatalError): ...
diff --git a/granian/rsgi.py b/granian/rsgi.py
@@ -26,8 +26,7 @@ class Scope:
     authority: Optional[str]
 
     @property
-    def headers(self) -> Headers:
-        ...
+    def headers(self) -> Headers: ...
 
 
 class WebsocketMessageType(int, Enum):

diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ reload = [
     'watchfiles~=0.21',
 ]
 lint = [
-    'ruff~=0.1.0',
+    'ruff~=0.5.0',
 ]
 test = [
     'httpx~=0.25.0',
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     *.pyc
     __pycache__
+    .idea/
     *.sublime-*
     .venv
     .vscode
@@ Expand Down @@