Switch from pylint to ruff

.github/workflows/main.yml

@@ -22,6 +22,7 @@ jobs:
         DISPLAY: :1
       run: |
         python -m pip install -e .[test]
+        python -m ruff check
         python -m pytest
     - name: Build package
       run: |

pyproject.toml

@@ -30,7 +30,19 @@ requires-python = ">= 3.8"
 homepage = "https://github.com/Moguri/panda3d-simplepbr"
 
 [project.optional-dependencies]
-test = ["pytest", "pylint~=3.0.0", "pytest-pylint"]
+test = ["pytest", "ruff"]
+
+[tool.ruff]
+line-length = 100
+
+[tool.ruff.lint]
+select = [
+    "E", # pycodestyle
+    "F", # pyflakes
+    "UP", # pyupgrade
+    "B", # flake8-bugbear
+    "SIM", # flake8-simplify
+]
 
 [project.scripts]
 hdr2env = "simplepbr.hdr2env:main"
@@ -40,16 +52,3 @@ version = {attr = "simplepbr.version.__version__"}
 
 [tool.setuptools]
 packages = ["simplepbr"]
-
-[tool.pytest.ini_options]
-addopts = "--pylint"
-
-[tool.pylint.main]
-jobs = 0
-
-[tool.pylint."message control"]
-disable = [
-    "r",
-    "missing-docstring",
-    "c-extension-no-member",
-]

simplepbr/__init__.py

@@ -9,11 +9,12 @@
 )
 import builtins
 import functools
-import math
 import os
+from typing import (
+    ClassVar,
+)
 from typing_extensions import (
     Any,
-    ClassVar,
     Literal,
     TypeAlias,
     TypeVar,
@@ -25,7 +26,7 @@
 from direct.filter.FilterManager import FilterManager
 from direct.task.Task import TaskManager
 
-from .version import __version__
+from .version import __version__ as __version__
 from .envmap import EnvMap
 from .envpool import EnvPool
 from . import logging
@@ -78,12 +79,13 @@ def _get_default_330() -> bool:
         cvar.get_word(i)
         for i in range(cvar.get_num_words())
     ]
-    if len(gl_version) >= 2 and gl_version[0] >= 3 and gl_version[1] >= 2:
-        # Not exactly accurate, but setting this variable to '3 2' is common for disabling
-        # the fixed-function pipeline and 3.2 support likely means 3.3 support as well.
-        return True
-
-    return False
+    # Not exactly accurate, but setting this variable to '3 2' is common for disabling
+    # the fixed-function pipeline and 3.2 support likely means 3.3 support as well.
+    return (
+        len(gl_version) >= 2
+        and gl_version[0] >= 3
+        and gl_version[1] >= 2
+    )
 
 
 TypeT = TypeVar('TypeT', bound=type)

simplepbr/_ibl_funcs_cpu.py

@@ -5,9 +5,11 @@
 import math
 import struct
 import typing
+from typing import (
+    Final,
+)
 from typing_extensions import (
     TypeAlias,
-    Final,
 )
 
 import panda3d.core as p3d

simplepbr/_shaderutils.py

@@ -2,15 +2,15 @@
 
 import os
 
+from typing import (
+    Any,
+)
 from typing_extensions import (
-    TYPE_CHECKING,
     TypeAlias,
 )
 
 import panda3d.core as p3d
 
-if TYPE_CHECKING:
-    from typing import Any
 
 try:
     from .shaders import shaders # type: ignore

simplepbr/envpool.py

@@ -1,6 +1,7 @@
-from __future__ import annotations
-
 from pathlib import Path
+from typing_extensions import (
+    Self,
+)
 
 import panda3d.core as p3d
 
@@ -13,7 +14,7 @@
 
 
 class EnvPool:
-    _ptr: 'EnvPool' | None = None
+    _ptr: Self | None = None
 
     def __init__(self) -> None:
         self._envmaps: dict[p3d.Filename, EnvMap] = {}
@@ -73,7 +74,7 @@ def load(
         return envmap
 
     @classmethod
-    def ptr(cls) -> 'EnvPool':
+    def ptr(cls) -> Self:
         if cls._ptr is None:
             cls._ptr = cls()