Merge pull request #14 from Quasars/ruff

[MAINT] ruff

Author: stuart-cls

.pre-commit-config.yaml

@@ -1,27 +1,17 @@
 repos:
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
-    hooks:
-      - id: pyupgrade
-        args: ["--py39-plus"]
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
-    hooks:
-      - id: black
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
       - id: check-ast
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: mixed-line-ending
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.13.2
     hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-bugbear
-          - flake8-comprehensions
-          - pep8-naming
-          - flake8-black
-          - flake8-pyproject
+      # Run the linter.
+      - id: ruff-check
+      # Run the formatter.
+      - id: ruff-format
+exclude: 'heterodyne_postprocessing'

pyproject.toml

@@ -31,13 +31,10 @@ doc = [
 test = [
     "pytest",
     "coverage",
-    "flake8",
-    "flake8-bugbear",
-    "flake8-pyproject",
-    "black",
 ]
 dev = [
     "pre-commit",
+    "ruff",
 ]
 
 [project.urls]
@@ -59,20 +56,12 @@ html-index = "orangecontrib.protospec.widgets:WIDGET_HELP_PATH"
 [tool.setuptools.packages.find]
 where = ["src"]
 
-[tool.black]
-skip_string_normalization = '1'
-force-exclude = '''.*heterodyne_postprocessing.*'''
-
-[tool.flake8]
-# Black compatibility
-max-line-length = 88
-extend-ignore = [
-    # See https://github.com/PyCQA/pycodestyle/issues/373
-    'E203',
-    # Ignore this since we use PyQt5 basically everywhere.
-    'N802',
-    # https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length
-    'E501',
-]
-extend-select = ['B590']
+[tool.ruff]
 exclude = ['heterodyne_postprocessing']
+force-exclude = true
+
+[tool.ruff.lint]
+select = ["E4", "E7", "E9", "F", "B", "UP"]
+
+[tool.ruff.format]
+quote-style = "preserve"

src/orangecontrib/protospec/data.py

@@ -38,7 +38,7 @@ def read_domain(sub):
                 if f'{sub}_args' in d
                 else ['{}'] * len(subdomain)
             )
-            for attr, args in zip(subdomain, subdomain_args):
+            for attr, args in zip(subdomain, subdomain_args, strict=False):
                 yield attr[0], attr[1], json.loads(args)
 
         def make_var(name, header, args):
@@ -235,7 +235,7 @@ def read(self):
         data = np.asarray(data, dtype=np.float64)  # Orange assumes X to be float64
         features = []
         for i, f in enumerate(domvals):
-            var = Orange.data.ContinuousVariable.make("%f" % f)
+            var = Orange.data.ContinuousVariable.make("%f" % f)  # noqa: UP031
             for k, v in var_attr_d.items():
                 var.attributes[k] = v[i]
             features.append(var)

src/orangecontrib/protospec/scripts/.ruff.toml

@@ -0,0 +1,6 @@
+[lint]
+# Allow the use of in_data in these scripts
+ignore = ["F821"]
+
+[format]
+exclude = ['*']