Use ruff rather than black and isort for linting

Author: jbcoe

.github/workflows/lint_python.yml

@@ -20,4 +20,3 @@ jobs:
       - run: uv sync
       - run: uv run ruff format --check --diff .
       - run: uv run ruff check
-      - run: uv run isort -c --diff nle/

.github/workflows/test_and_deploy.yml

@@ -53,6 +53,9 @@ jobs:
           python-version: '3.10'
       - name: Ensure latest pip, wheel & setuptools
         run: python -m pip install -q --upgrade pip wheel setuptools
+      - name: Install dependencies
+        run: |
+          brew install cmake
       - uses: actions/checkout@v4
       - name: Generate sdist
         run: |
@@ -79,6 +82,9 @@ jobs:
           python-version: 3.13
       - name: Ensure latest pip, wheel & setuptools
         run: python -m pip install -q --upgrade pip wheel setuptools
+      - name: Install dependencies
+        run: |
+          brew install cmake
       - uses: actions/checkout@v4
       - name: Generate sdist
         run: |

.pre-commit-config.yaml

@@ -2,6 +2,7 @@
 repos:
   - hooks:
       - id: ruff
+        args: [--fix]
       - id: ruff-format
     repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.4.3
@@ -17,8 +18,3 @@ repos:
         language: system
         name: clang-format
     repo: local
-  - hooks:
-      - id: isort
-        name: isort (python)
-    repo: https://github.com/pycqa/isort
-    rev: 5.13.2

nle/dataset/__init__.py

@@ -1,4 +1,4 @@
-from nle._pyconverter import Converter
 import nle.dataset.db
-from nle.dataset.populate_db import add_altorg_directory, add_nledata_directory
+from nle._pyconverter import Converter
 from nle.dataset.dataset import TtyrecDataset
+from nle.dataset.populate_db import add_altorg_directory, add_nledata_directory

nle/env/__init__.py

@@ -2,7 +2,7 @@
 import gymnasium as gym
 from gymnasium.envs import registration
 
-from nle.env.base import NLE, DUNGEON_SHAPE
+from nle.env.base import DUNGEON_SHAPE, NLE
 
 _version = "v0"
 

nle/nethack/__init__.py

@@ -1,16 +1,16 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
-from nle.nethack.actions import *  # noqa: F403
 from nle._pynethack.nethack import *  # noqa: F403
+from nle.nethack.actions import *  # noqa: F403
 from nle.nethack.nethack import (
-    Nethack,
-    NETHACKOPTIONS,
-    DUNGEON_SHAPE,
     BLSTATS_SHAPE,
-    MESSAGE_SHAPE,
-    INV_SIZE,
-    PROGRAM_STATE_SHAPE,
+    DUNGEON_SHAPE,
     INTERNAL_SHAPE,
+    INV_SIZE,
+    MESSAGE_SHAPE,
+    NETHACKOPTIONS,
     OBSERVATION_DESC,
+    PROGRAM_STATE_SHAPE,
     TTYREC_VERSION,
+    Nethack,
     tty_render,
 )

nle/scripts/collect_env.py

@@ -6,10 +6,7 @@
 # Original version from:
 # https://github.com/pytorch/pytorch/blob/fa5bc9fa/torch/utils/collect_env.py
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import locale
 import os

nle/tests/test_dataset.py

@@ -4,16 +4,19 @@
 
 import numpy as np
 import pytest
-from test_converter import COLSROWS
-from test_converter import FINALFRAME
-from test_converter import FINALFRAMECOLORS
-from test_converter import TIMESTAMPS
-from test_converter import getfilename
-from test_db import conn  # noqa: F401
-from test_db import mockdata  # noqa: F401
-
-from nle.dataset import dataset
-from nle.dataset import db
+from test_converter import (
+    COLSROWS,
+    FINALFRAME,
+    FINALFRAMECOLORS,
+    TIMESTAMPS,
+    getfilename,
+)
+from test_db import (
+    conn,  # noqa: F401
+    mockdata,  # noqa: F401
+)
+
+from nle.dataset import dataset, db
 
 
 class TestDataset:

nle/tests/test_db.py

@@ -4,8 +4,7 @@
 import test_converter
 
 import nle.env.tasks
-from nle.dataset import db
-from nle.dataset import populate_db
+from nle.dataset import db, populate_db
 
 TTYRECS = [
     ("aaa", test_converter.TTYREC_2020),

nle/tests/test_nethack.py

@@ -7,8 +7,7 @@
 import numpy as np
 import pytest
 
-from nle import _pynethack
-from nle import nethack
+from nle import _pynethack, nethack
 
 # MORE + compass directions + long compass directions.
 ACTIONS = [