Start applying ruff rules #269

DimitriPapadopoulos · 2025-01-18T16:30:32Z

@skjerns Ready for review.

F401 imported but unused

F841 Local variable is assigned to but never used

E402 Module level import not at top of file

E701 Multiple statements on one line (colon)

E713 Test for membership should be `not in`

E722 Do not use bare `except`

E731 Do not assign a `lambda` expression, use a `def`

W293 Blank line contains whitespace

W391 Extra newline at end of file

UP006 Use `dist` instead of `Dist` for type annotation UP006 Use `list` instead of `List` for type annotation

UP007 Use `X | Y` for type annotations

UP009 UTF-8 encoding declaration is unnecessary

UP012 Unnecessary call to `encode` as UTF-8

UP020 Use builtin `open`

skjerns · 2025-01-27T17:13:35Z

pyedflib/tests/test_edfwriter.py

        f.writeSamples(data_list)
        f.close()

        f = pyedflib.EdfReader(self.bdfplus_data_file)
        data1_read = f.readSignal(0)
        data2_read = f.readSignal(1)
-        f._close
+        f._close()


uh strange that this never gave any access/locking problems

C408 Unnecessary `dict()` call (rewrite as a literal)

C419 Unnecessary list comprehension

ISC001 Implicitly concatenated string literals on one line

ISC002 Implicitly concatenated string literals over multiple lines

ISC003 Explicitly concatenated string should be implicitly concatenated

SIM102 Use a single `if` statement instead of nested `if` statements

SIM201 Use `... != ...` instead of `not ... == ...`

FLY002 Consider f-string instead of string join

PERF401 Use a list comprehension to create a transformed list

FURB110 Replace ternary `if` expression with `or` operator

FURB113 Use `extend(()` instead of repeatedly calling `append()`

FURB167 Use of regular expression alias

FURB171 Membership test against single-item container

FURB188 Prefer `str.removeprefix()` over conditionally replacing with slice.

RUF022 `__all__` is not sorted

RUF027 Possible f-string without an `f` prefix

RUF036 `None` not at the end of the type annotation.

RUF039 First argument to `re.match()` is not raw string RUF039 First argument to `re.search()` is not raw string RUF039 First argument to `re.compile()` is not raw string

skjerns · 2025-01-27T17:21:14Z

thanks! looking all good :)

is there a necessity to use add a github action for ruff? or any other automated checking tool?

DimitriPapadopoulos · 2025-01-27T17:28:17Z

Two options:

use pytest-ruff within the existing test GitHub Action (that's what I've chosen in 88ec4c1)
create a new ruff job

skjerns · 2025-01-27T17:48:16Z

Two options:

use pytest-ruff within the existing test GitHub Action (that's what I've chosen in 88ec4c1)

create a new ruff job

I think it would be nicer to have one dedicated job, that way it is easier to see if errors are caused by cosmetic changes or functional tests failing.

Also using the current matrix layout the pytest --ruff will run redundantly several times needlessly.

Replace flake8 with ruff.

* Document that Python 3.8 is still tested * Document that Python 3.13 is supported * Update GitHub actions

DimitriPapadopoulos · 2025-01-29T10:19:01Z

Updated to run ruff directly from a GitHub Action.

skjerns · 2025-02-03T09:19:12Z

thanks! looking good :)

DimitriPapadopoulos force-pushed the ruff branch 3 times, most recently from cdc3e7b to 78ff00e Compare January 18, 2025 17:35

DimitriPapadopoulos mentioned this pull request Jan 21, 2025

Remove Python 2.7 leftovers #270

Merged

DimitriPapadopoulos force-pushed the ruff branch 12 times, most recently from fdd051f to 881f745 Compare January 26, 2025 20:55

DimitriPapadopoulos added 14 commits January 27, 2025 18:09

Apply ruff/Pyflakes rule F401

f8eaf8c

F401 imported but unused

Apply ruff/Pyflakes rule F841

7dd16d9

F841 Local variable is assigned to but never used

Apply ruff/pycodestyle rule E402

03f2380

E402 Module level import not at top of file

Apply ruff/pycodestyle rule E701

43d9609

E701 Multiple statements on one line (colon)

Apply ruff/pycodestyle ruke E713

cff62cc

E713 Test for membership should be `not in`

Apply ruff/pycodestyle rule E722

cf5594b

E722 Do not use bare `except`

Apply ruff/pycodestyle rule E731

0a0cf30

E731 Do not assign a `lambda` expression, use a `def`

Apply ruff/pycodestyle rule W293

52cb37c

W293 Blank line contains whitespace

Apply ruff/pycodestyle rule W391

ecc9c7e

W391 Extra newline at end of file

Apply ruff/pyupgrade rule UP006

511bd4a

UP006 Use `dist` instead of `Dist` for type annotation UP006 Use `list` instead of `List` for type annotation

Apply ruff/pyupgrade rule UP007

c9de37f

UP007 Use `X | Y` for type annotations

Apply ruff/pyupgrade rule UP009

0a12fec

UP009 UTF-8 encoding declaration is unnecessary

Apply ruff/pyupgrade rule UP012

356ffcf

UP012 Unnecessary call to `encode` as UTF-8

Apply ruff/pyupgrade rule UP020

c53f9bc

UP020 Use builtin `open`

skjerns reviewed Jan 27, 2025

View reviewed changes

DimitriPapadopoulos added 18 commits January 27, 2025 18:13

Apply ruff/flake8-comprehensions rule C408

d3ca87b

C408 Unnecessary `dict()` call (rewrite as a literal)

Apply ruff/flake8-comprehensions rule C419

afcc9ab

C419 Unnecessary list comprehension

Apply ruff/flake8-implicit-str-concat rule ISC001

4110339

ISC001 Implicitly concatenated string literals on one line

Apply ruff/flake8-implicit-str-concat rule ISC002

03ebafa

ISC002 Implicitly concatenated string literals over multiple lines

Apply ruff/flake8-implicit-str-concat rule ISC003

5e3feee

ISC003 Explicitly concatenated string should be implicitly concatenated

Apply ruff/flake8-simplify rule SIM102

e66455a

SIM102 Use a single `if` statement instead of nested `if` statements

Apply ruff/flake8-simplify rule SIM201

560a231

SIM201 Use `... != ...` instead of `not ... == ...`

Apply ruff/flynt rule FLY002

fead287

FLY002 Consider f-string instead of string join

Apply ruff/Perflint rule PERF401

3d3a19c

PERF401 Use a list comprehension to create a transformed list

Apply ruff/refurb rule FURB110

dcb02c5

FURB110 Replace ternary `if` expression with `or` operator

Apply ruff/refurb rule FURB113

123ed2c

FURB113 Use `extend(()` instead of repeatedly calling `append()`

Apply ruff/refub rule FURB167

09803e5

FURB167 Use of regular expression alias

Apply ruff/refurb rule FURB171

3232c59

FURB171 Membership test against single-item container

Apply ruff/refurb rule FURB188

6bcdb1c

FURB188 Prefer `str.removeprefix()` over conditionally replacing with slice.

Apply ruff rule RUF022

d046048

RUF022 `__all__` is not sorted

Apply ruff rule RUF027

5748b28

RUF027 Possible f-string without an `f` prefix

Apply ruff rule RUF036

b41859a

RUF036 `None` not at the end of the type annotation.

Apply ruff rule RUF039

f74d13c

RUF039 First argument to `re.match()` is not raw string RUF039 First argument to `re.search()` is not raw string RUF039 First argument to `re.compile()` is not raw string

DimitriPapadopoulos force-pushed the ruff branch from 881f745 to dc5ca4b Compare January 27, 2025 17:24

DimitriPapadopoulos added 2 commits January 29, 2025 11:14

Start enforcing ruff rules

75a979c

Replace flake8 with ruff.

Update CI

594972b

* Document that Python 3.8 is still tested * Document that Python 3.13 is supported * Update GitHub actions

DimitriPapadopoulos force-pushed the ruff branch from dc5ca4b to 594972b Compare January 29, 2025 10:15

skjerns merged commit 8b3c29f into holgern:master Feb 3, 2025
33 checks passed

DimitriPapadopoulos deleted the ruff branch February 3, 2025 12:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Start applying ruff rules #269

Start applying ruff rules #269

DimitriPapadopoulos commented Jan 18, 2025 •

edited

Loading

skjerns Jan 27, 2025

skjerns commented Jan 27, 2025

DimitriPapadopoulos commented Jan 27, 2025 •

edited

Loading

skjerns commented Jan 27, 2025 •

edited

Loading

DimitriPapadopoulos commented Jan 29, 2025

skjerns commented Feb 3, 2025

Start applying ruff rules #269

Start applying ruff rules #269

Conversation

DimitriPapadopoulos commented Jan 18, 2025 • edited Loading

skjerns Jan 27, 2025

Choose a reason for hiding this comment

skjerns commented Jan 27, 2025

DimitriPapadopoulos commented Jan 27, 2025 • edited Loading

skjerns commented Jan 27, 2025 • edited Loading

DimitriPapadopoulos commented Jan 29, 2025

skjerns commented Feb 3, 2025

DimitriPapadopoulos commented Jan 18, 2025 •

edited

Loading

DimitriPapadopoulos commented Jan 27, 2025 •

edited

Loading

skjerns commented Jan 27, 2025 •

edited

Loading