ci: use ruff instead of isort and flake8 (#34)

Author: sbdchd

.circleci/config.yml

@@ -0,0 +1,54 @@
+# Taken from: https://jacobian.org/til/github-actions-poetry/
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.11
+
+      - name: cache poetry install
+        uses: actions/cache@v2
+        with:
+          path: ~/.local
+          key: poetry-1.1.9-0
+
+      - uses: snok/install-poetry@v1
+        with:
+          version: 1.1.9
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: cache deps
+        id: cache-deps
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: pydeps-${{ hashFiles('**/poetry.lock') }}
+
+      # Install dependencies. `--no-root` means "install all dependencies but not the project
+      # itself", which is what you want to avoid caching _your_ code. The `if` statement
+      # ensures this only runs on a cache miss.
+      - run: poetry install --no-interaction --no-root
+        if: steps.cache-deps.outputs.cache-hit != 'true'
+
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: "package.json"
+          cache: "yarn"
+
+      - run: yarn install --frozen-lockfile --non-interactive
+
+      # Now install _your_ project. This isn't necessary for many types of projects -- particularly
+      # things like Django apps don't need this. But it's a good idea since it fully-exercises the
+      # pyproject.toml and makes that if you add things like console-scripts at some point that
+      # they'll be installed and working.
+      - run: poetry install --no-interaction
+
+      - name: lint
+        run: ./s/lint
+

.github/workflows/test.yml

@@ -1,4 +1,2 @@
-from typing import Union
-
-def force_bytes(string: Union[str, bytes]) -> bytes: ...
-def force_text(string: Union[str, bytes]) -> str: ...
+def force_bytes(string: str | bytes) -> bytes: ...
+def force_text(string: str | bytes) -> str: ...

coreapi-stubs/compat.pyi

@@ -1,7 +1,5 @@
-from typing import Tuple, Type, Union
+def force_bytes(string: str | bytes) -> bytes: ...
+def force_text(string: str | bytes) -> str: ...
 
-def force_bytes(string: Union[str, bytes]) -> bytes: ...
-def force_text(string: Union[str, bytes]) -> str: ...
-
-text_types: Tuple[Type[str]]
-numeric_types: Tuple[Type[float], Type[int]]
+text_types: tuple[type[str]]
+numeric_types: tuple[type[float], type[int]]

coreschema-stubs/compat.pyi

@@ -1,4 +1,5 @@
-from typing import Any, List, NamedTuple, Optional, Pattern
+from re import Pattern
+from typing import Any, NamedTuple
 
 from coreschema.compat import numeric_types as numeric_types
 from coreschema.compat import text_types as text_types
@@ -7,16 +8,16 @@ from coreschema.utils import uniq as uniq
 
 class Error(NamedTuple):
     text: str
-    index: List[str]  # type: ignore [assignment]
+    index: list[str]  # type: ignore [assignment]
 
-def push_index(errors: List[Error], key: Any) -> List[str]: ...
+def push_index(errors: list[Error], key: Any) -> list[str]: ...
 
 class Schema:
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     title: Any = ...
     description: Any = ...
     default: Any = ...
-    def __init__(self, title: str = ..., description: str = ..., default: Optional[Any] = ...) -> None: ...
+    def __init__(self, title: str = ..., description: str = ..., default: Any | None = ...) -> None: ...
     def make_error(self, code: str) -> Error: ...
     def __or__(self, other: Schema) -> Union: ...
     def __and__(self, other: Schema) -> Intersection: ...
@@ -25,137 +26,137 @@ class Schema:
     def __eq__(self, other: Schema) -> bool: ...  # type: ignore [override]
 
 class Object(Schema):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     additional_properties_schema: Any = ...
     properties: Any = ...
-    required: Optional[bool] = ...
+    required: bool | None = ...
     max_properties: int = ...
     min_properties: int = ...
     pattern_properties: Any = ...
     additional_properties: Any = ...
     pattern_properties_regex: Any = ...
     def __init__(
         self,
-        properties: Optional[Any] = ...,
-        required: Optional[bool] = ...,
-        max_properties: Optional[Any] = ...,
-        min_properties: Optional[Any] = ...,
-        pattern_properties: Optional[Any] = ...,
+        properties: Any | None = ...,
+        required: bool | None = ...,
+        max_properties: Any | None = ...,
+        min_properties: Any | None = ...,
+        pattern_properties: Any | None = ...,
         additional_properties: bool = ...,
         **kwargs: Any
     ) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Array(Schema):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     items: Schema = ...
     max_items: int = ...
     min_items: int = ...
     unique_items: int = ...
     additional_items: int = ...
     def __init__(
         self,
-        items: Optional[Any] = ...,
-        max_items: Optional[Any] = ...,
-        min_items: Optional[Any] = ...,
+        items: Any | None = ...,
+        max_items: Any | None = ...,
+        min_items: Any | None = ...,
         unique_items: bool = ...,
         additional_items: bool = ...,
         **kwargs: Any
     ) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Number(Schema):
     integer_only: bool = ...
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     minimum: int = ...
     maximum: int = ...
     exclusive_minimum: int = ...
     exclusive_maximum: int = ...
-    multiple_of: Optional[int] = ...
+    multiple_of: int | None = ...
     def __init__(
         self,
-        minimum: Optional[int] = ...,
-        maximum: Optional[int] = ...,
+        minimum: int | None = ...,
+        maximum: int | None = ...,
         exclusive_minimum: bool = ...,
         exclusive_maximum: bool = ...,
-        multiple_of: Optional[int] = ...,
+        multiple_of: int | None = ...,
         **kwargs: Any
     ) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Integer(Number):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     integer_only: bool = ...
 
 class String(Schema):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     max_length: Any = ...
     min_length: Any = ...
     pattern: str = ...
     format: str = ...
     pattern_regex: Pattern[str] = ...
     def __init__(
         self,
-        max_length: Optional[int] = ...,
-        min_length: Optional[int] = ...,
-        pattern: Optional[str] = ...,
-        format: Optional[Any] = ...,
+        max_length: int | None = ...,
+        min_length: int | None = ...,
+        pattern: str | None = ...,
+        format: Any | None = ...,
         **kwargs: Any
     ) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Boolean(Schema):
-    errors: List[Error] = ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    errors: list[Error] = ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Null(Schema):
-    errors: List[Error] = ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    errors: list[Error] = ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Enum(Schema):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     enum: Any = ...
     exact: Any = ...
     def __init__(self, enum: Any, **kwargs: Any) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Anything(Schema):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     types: Any = ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Union(Schema):
-    errors: List[Error] = ...
-    children: List[Schema] = ...
-    def __init__(self, children: List[Schema], **kwargs: Any) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    errors: list[Error] = ...
+    children: list[Schema] = ...
+    def __init__(self, children: list[Schema], **kwargs: Any) -> None: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Intersection(Schema):
-    children: List[Schema] = ...
-    def __init__(self, children: List[Schema], **kwargs: Any) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    children: list[Schema] = ...
+    def __init__(self, children: list[Schema], **kwargs: Any) -> None: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class ExclusiveUnion(Schema):
-    errors: List[Error] = ...
-    children: List[Schema] = ...
-    def __init__(self, children: List[Schema], **kwargs: Any) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    errors: list[Error] = ...
+    children: list[Schema] = ...
+    def __init__(self, children: list[Schema], **kwargs: Any) -> None: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Not(Schema):
-    errors: List[Error] = ...
+    errors: list[Error] = ...
     child: Any = ...
     def __init__(self, child: Any, **kwargs: Any) -> None: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class Ref(Schema):
     ref_name: Any = ...
     def __init__(self, ref_name: Any) -> None: ...
     def dereference(self, context: Any) -> Any: ...
-    def validate(self, value: Any, context: Optional[Any] = ...) -> List[Error]: ...
+    def validate(self, value: Any, context: Any | None = ...) -> list[Error]: ...
 
 class RefSpace(Schema):
     refs: Any = ...
     root: Any = ...
     root_validator: Any = ...
     def __init__(self, refs: Any, root: Any) -> None: ...
-    def validate(self, value: Any) -> List[Error]: ...
+    def validate(self, value: Any) -> list[Error]: ...

coreschema-stubs/schemas.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Iterable
+from collections.abc import Iterable
+from typing import Any
 
 def unbool(element: Any, true: Any = ..., false: Any = ...) -> Any: ...
 def uniq(container: Iterable[object]) -> bool: ...

coreschema-stubs/utils.pyi

@@ -1,6 +1,6 @@
-from typing import Any, Optional
+from typing import Any
 
 def dereference(lookup_string: Any, struct: Any) -> Any: ...
 def is_json_pointer(value: Any) -> Any: ...
-def get_dicts(item: Any, dereference_using: Optional[Any] = ...) -> Any: ...
+def get_dicts(item: Any, dereference_using: Any | None = ...) -> Any: ...
 def get_strings(item: Any) -> Any: ...

openapi_codec-stubs/decode.pyi

@@ -7,5 +7,8 @@
   "license": "MIT",
   "devDependencies": {
     "pyright": "^1.1.110"
+  },
+  "volta": {
+    "node": "18.15.0"
   }
 }