Setup linting and formatting using ruff (#62)

* ruff auto fix

* format

* fix typing

* implement ruff fix

* implement more ruff fix

* lint with ruff

* install ruff

* consistent formatting betweent python version

* fix line size

* format

* remove comments

* add ruff checks

* fix ruff checks

* format

.github/workflows/main.yml

@@ -29,14 +29,10 @@ jobs:
             ${{ runner.os }}-pip-
       - name: Install Hatch
         uses: pypa/hatch@a3c83ab3d481fbc2dc91dd0088628817488dd1d5
-      - name: Install application and deps
-        run: |
-          python -m pip install --upgrade pip
-          pip install .
       - name: Linting
         run: |
-          pip install flake8
-          flake8 .
+          pip install ruff
+          ruff check
       - name: Run tests
         run: |
           hatch run test:pytest

bin/validate-raythena-job.py

@@ -1,20 +1,18 @@
 #!/usr/bin/env python
-from __future__ import print_function
 
-from array import array
 import argparse
 import json
 import os.path as path
-
+from array import array
 import ROOT
 
 
 def get_event_numbers(filename):
     f = ROOT.TFile.Open(filename)
     tree = f.Get("POOLCollectionTree")
-    event_number = array('Q', [0])
+    event_number = array("Q", [0])
     n_entries = tree.GetEntries()
-    tree.SetBranchAddress('EventNumber', event_number)
+    tree.SetBranchAddress("EventNumber", event_number)
     event_numbers = list()
     for n in range(n_entries):
         tree.GetEntry(n)
@@ -23,10 +21,10 @@ def get_event_numbers(filename):
 
 
 def validate_job(job_dir, job_state_file):
-    with open(job_state_file, 'r') as f:
+    with open(job_state_file) as f:
         job_state = json.load(f)
     merged_input_files = job_state["merged"]
-    merged_output_files = set([list(x.keys())[0] for x in merged_input_files.values()])
+    merged_output_files = set([next(iter(x.keys())) for x in merged_input_files.values()])
     event_numbers = set()
     for output_file in merged_output_files:
         output_file_abs = path.join(job_dir, "final", output_file)
@@ -37,14 +35,30 @@ def validate_job(job_dir, job_state_file):
         current_event_numbers = get_event_numbers(output_file_abs)
         unique_current_event_numbers = set(current_event_numbers)
         if len(unique_current_event_numbers) != len(current_event_numbers):
-            print("Duplicate events in file " + output_file + "(" + str(len(current_event_numbers) - len(unique_current_event_numbers)) + "): ")
+            print(
+                "Duplicate events in file "
+                + output_file
+                + "("
+                + str(len(current_event_numbers) - len(unique_current_event_numbers))
+                + "): "
+            )
             exit(1)
         print(str(len(current_event_numbers)) + " events in file " + output_file)
         if not unique_current_event_numbers.isdisjoint(event_numbers):
-            print("Found duplicate events in file " + output_file + ": " + str(unique_current_event_numbers & event_numbers))
+            print(
+                "Found duplicate events in file "
+                + output_file
+                + ": "
+                + str(unique_current_event_numbers & event_numbers)
+            )
             exit(1)
         event_numbers |= unique_current_event_numbers
-    print("No duplicate found. # events merged: " + str(len(event_numbers)) + ", # of files: " + str(len(merged_output_files)))
+    print(
+        "No duplicate found. # events merged: "
+        + str(len(event_numbers))
+        + ", # of files: "
+        + str(len(merged_output_files))
+    )
 
 
 def main():

example/standalone_ray_test_hello_world.py

@@ -9,16 +9,16 @@
 import argparse
 import os
 import platform
+import time
 from pprint import pprint
 import ray
-import time
 
 
 def build_nodes_resource_list(redis_ip: str):
     nodes = ray.nodes()
     resource_list = list()
     for node in nodes:
-        naddr = node['NodeManagerAddress']
+        naddr = node["NodeManagerAddress"]
         if naddr == redis_ip:
             continue
         else:
@@ -27,7 +27,7 @@ def build_nodes_resource_list(redis_ip: str):
 
 
 @ray.remote
-class actor():
+class actor:
     def __init__(self) -> None:
         self.pid = os.getpid()
         self.hostname = platform.node()
@@ -42,8 +42,11 @@ def ping(self):
 
 def main(redis_ip: str, redis_port: str, redis_password: str):
     redis_address = f"{redis_ip}:{redis_port}"
-    ray.init(ignore_reinit_error=True,
-             address="%s" % redis_address, _redis_password="%s" % redis_password)
+    ray.init(
+        ignore_reinit_error=True,
+        address=f"{redis_address}",
+        _redis_password=f"{redis_password}",
+    )
 
     # show the ray cluster
     print(f"Ray Cluster resources : {ray.cluster_resources()}")
@@ -73,10 +76,10 @@ def main(redis_ip: str, redis_port: str, redis_password: str):
 
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Wait on ray head node or workers to connect')
-    parser.add_argument('--redis-ip', default="%s" % (os.environ["RAYTHENA_RAY_HEAD_IP"]))
-    parser.add_argument('--redis-port', default="%s" % (os.environ["RAYTHENA_RAY_REDIS_PORT"]))
-    parser.add_argument('--redis-password', default=os.environ["RAYTHENA_RAY_REDIS_PASSWORD"])
+    parser = argparse.ArgumentParser(description="Wait on ray head node or workers to connect")
+    parser.add_argument("--redis-ip", default="{}".format(os.environ["RAYTHENA_RAY_HEAD_IP"]))
+    parser.add_argument("--redis-port", default="{}".format(os.environ["RAYTHENA_RAY_REDIS_PORT"]))
+    parser.add_argument("--redis-password", default=os.environ["RAYTHENA_RAY_REDIS_PASSWORD"])
     args = parser.parse_args()
     print(f"args : {args}")
     main(args.redis_ip, args.redis_port, args.redis_password)

pyproject.toml

@@ -45,9 +45,11 @@ dependencies = [
 
 [tool.ruff]
 
-line-length = 80
+line-length = 120
 indent-width = 4
 
+target-version = "py39"
+
 [tool.ruff.lint]
 
 select = [
@@ -62,5 +64,10 @@ select = [
   # flake8-simplify
   "SIM",
   # isort
-  "I"
+  "I",
+  # Ruff
+  "RUF",
 ]
+
+[tool.ruff.lint.isort]
+no-lines-before = ["third-party", "first-party", "standard-library"]

src/raythena/__init__.py

@@ -1,5 +1,6 @@
 try:
     from . import _version
+
     __version__ = _version.__version__
 except:  # noqa: E722
     __version__ = "0.0.0"