MAINT: Start applying ruff/Pycodestyle rules by DimitriPapadopoulos · Pull Request #26857 · numpy/numpy

DimitriPapadopoulos · 2024-07-04T20:48:52Z

Start working on #24994.

I have left out most of distutils, *.pyi files, and some special cases that seem to require extra attention.

numpy/_core/arrayprint.py

rkern

I haven't individually confirmed all of the import removals, but I did note the ones that had a comment explaining why they were there and should not be removed.

I think the other changes look good to my eyeballs.

numpy/_core/arrayprint.py

numpy/_core/numerictypes.py

numpy/testing/overrides.py

numpy/tests/test_lazyloading.py

mattip · 2024-08-26T14:20:16Z

numpy/_core/tests/test_umath.py

+            assert(np.isnan(div)), "div: %s" % div
            div = np.floor_divide(fnan, fzer)
-            assert(np.isnan(div)), "dt: %s, div: %s" % (dt, div)
+            assert(np.isnan(div)), "div: %s" % div


Is there a reason to not remove the parentheses from the asserts?

Suggested change

assert(np.isnan(div)), "div: %s" % div

assert np.isnan(div), "div: %s" % div

These commits contain automated fixes when possible. I try not to manually modify these fixes, unless really needed. There's a ruff/pyupgrade rule for extraneous parentheses (UP034), which I could apply in a different PR.

mattip

We usually do not like these kinds of code reformats, but this one is actually quite nice. I thing we shouldn't be touching the deprecated numpy.distutils, could you revert those?

mattip · 2024-08-26T14:23:02Z

numpy/f2py/_src_pyf.py

@@ -1,3 +1,4 @@
+import os


Hmm, how did this work before?

Perhaps resolve_includes() is usually not called.

We usually do not like these kinds of code reformats, but this one is actually quite nice.

This is not really a "reformat", rather in support of migrating linting from Pycodestyle to ruff (#24994).

I thing we shouldn't be touching the deprecated numpy.distutils, could you revert those?

Done.

Actually, numpy.distutils had already been touched. Should I revert prior linting changes?
https://github.com/numpy/numpy/commits/main/numpy/distutils

mattip · 2024-08-26T14:25:37Z

numpy/lib/tests/test_arraysetops.py

            assert_isin_equal(empty_array, empty_array)

-    @pytest.mark.parametrize("kind", [None, "sort", "table"])
-    def test_isin(self, kind):


Rather than remove this, please rename the tests and keep them separate.

We have two test functions with the same name and identical parameters:

numpy/numpy/lib/tests/test_arraysetops.py

Lines 214 to 215 in eb6ac83

@pytest.mark.parametrize("kind", [None, "sort", "table"])

def test_isin(self, kind):

numpy/numpy/lib/tests/test_arraysetops.py

Lines 272 to 273 in eb6ac83

@pytest.mark.parametrize("kind", [None, "sort", "table"])

def test_isin(self, kind):

I think it makes sense to merge, doesn't it?

I renamed the second test_isin to test_isin_additional.

mattip · 2024-08-26T14:26:50Z

numpy/linalg/lapack_lite/clapack_scrub.py

        nsteps = None

-    source = scrub_source(source, nsteps, verbose=True)
+    source = scrubSource(source, nsteps, verbose=True)


Huh. How did this work?

I guess this Python 2.7 script hasn't been used for a long time - probably not after f589305 in 2018.

charris · 2024-08-27T17:45:32Z

Needs rebase.

F401 imported but unused I have left out *.pyi files. Still lots of occurrences to examine. Co-authored-by: Robert Kern <[email protected]>

F541 f-string without any placeholders

F811 Redefinition of unused `...` I have left out *.pyi files and some special cases.

F821 Undefined name I have left out *.pyi files and some special cases.

E401 Multiple imports on one line

E701 Multiple statements on one line (colon)

E711 Comparison to `None` should be `cond is None`

E712 Avoid inequality comparisons to `True`; use `if not cond:` for false checks

E713 Test for membership should be `not in`

E714 Test for object identity should be `is not`

E722 Do not use bare `except`

Co-authored-by: Robert Kern <[email protected]>

charris · 2024-08-28T14:15:09Z

Thanks @DimitriPapadopoulos .

DimitriPapadopoulos force-pushed the 24994 branch 4 times, most recently from 55c9ba4 to 82f20e1 Compare July 4, 2024 21:21

DimitriPapadopoulos changed the title ~~Start applying ruff/Pycodestyle rules~~ MAINT: start applying ruff/Pycodestyle rules Jul 4, 2024

DimitriPapadopoulos force-pushed the 24994 branch 4 times, most recently from 7cecfd0 to da91eaf Compare July 4, 2024 21:51

eendebakpt reviewed Jul 4, 2024

View reviewed changes

numpy/_core/arrayprint.py Show resolved Hide resolved

DimitriPapadopoulos force-pushed the 24994 branch 7 times, most recently from 91381ad to b669241 Compare July 6, 2024 12:23

DimitriPapadopoulos marked this pull request as ready for review July 6, 2024 12:24

DimitriPapadopoulos force-pushed the 24994 branch from b669241 to d8b8d95 Compare July 6, 2024 12:55

DimitriPapadopoulos changed the title ~~MAINT: start applying ruff/Pycodestyle rules~~ MAINT: start applying ruff/pycodestyle rules Jul 6, 2024

DimitriPapadopoulos mentioned this pull request Jul 6, 2024

MAINT: start applying ruff/Perflint rules (PERF) #26876

Closed

DimitriPapadopoulos force-pushed the 24994 branch from d8b8d95 to d22d7d9 Compare July 10, 2024 09:28

rkern reviewed Jul 11, 2024

View reviewed changes

DimitriPapadopoulos force-pushed the 24994 branch from f6c9e96 to 1fea2d3 Compare July 11, 2024 16:13

mattip reviewed Aug 26, 2024

View reviewed changes

DimitriPapadopoulos force-pushed the 24994 branch 4 times, most recently from d9419f1 to 2d05f15 Compare August 27, 2024 14:24

DimitriPapadopoulos force-pushed the 24994 branch 2 times, most recently from 21eaf4e to f30b9e8 Compare August 27, 2024 14:30

DimitriPapadopoulos changed the title ~~MAINT: start applying ruff/pycodestyle rules~~ MAINT: Start applying ruff/Pycodestyle rules Aug 27, 2024

DimitriPapadopoulos force-pushed the 24994 branch from f30b9e8 to 5922427 Compare August 27, 2024 18:00

DimitriPapadopoulos and others added 12 commits August 27, 2024 23:29

MAINT: apply ruff/Pycodestyle rule F401

c0e9b53

F401 imported but unused I have left out *.pyi files. Still lots of occurrences to examine. Co-authored-by: Robert Kern <[email protected]>

MAINT: apply ruff/Pycodestyle rule F541

5ef245a

F541 f-string without any placeholders

MAINT: apply ruff/Pycodestyle rule F811

5c9179b

F811 Redefinition of unused `...` I have left out *.pyi files and some special cases.

MAINT: apply ruff/Pycodestyle rule F821

2abe178

F821 Undefined name I have left out *.pyi files and some special cases.

MAINT: apply ruff/Pycodestyle rule E401

3f3e6f2

E401 Multiple imports on one line

MAINT: apply ruff/Pycodestyle rule E701

563ec5b

E701 Multiple statements on one line (colon)

MAINT: apply ruff/Pycodestyle rule E711

52bf3ca

E711 Comparison to `None` should be `cond is None`

MAINT: apply ruff/Pycodestyle rule E712

bb87341

E712 Avoid inequality comparisons to `True`; use `if not cond:` for false checks

MAINT: apply ruff/Pycodestyle rule E713

0ae8180

E713 Test for membership should be `not in`

MAINT: apply ruff/Pycodestyle rule E714

8f2a4da

E714 Test for object identity should be `is not`

MAINT: apply ruff/Pycodestyle rule E722

014c342

E722 Do not use bare `except`

Update numpy/_core/arrayprint.py

694b862

Co-authored-by: Robert Kern <[email protected]>

DimitriPapadopoulos force-pushed the 24994 branch from 3a48cc5 to 694b862 Compare August 27, 2024 20:29

charris approved these changes Aug 27, 2024

View reviewed changes

charris added the 03 - Maintenance label Aug 28, 2024

charris merged commit 221ea71 into numpy:main Aug 28, 2024

DimitriPapadopoulos deleted the 24994 branch August 29, 2024 08:09

	assert(np.isnan(div)), "div: %s" % div
	assert np.isnan(div), "div: %s" % div

	@pytest.mark.parametrize("kind", [None, "sort", "table"])
	def test_isin(self, kind):

Uh oh!

Comments

Conversation

DimitriPapadopoulos commented Jul 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

rkern left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mattip Aug 26, 2024

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattip left a comment

Choose a reason for hiding this comment

Uh oh!

mattip Aug 26, 2024

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattip Aug 26, 2024

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattip Aug 26, 2024

Choose a reason for hiding this comment

Uh oh!

DimitriPapadopoulos Aug 27, 2024

Choose a reason for hiding this comment

Uh oh!

charris commented Aug 27, 2024

Uh oh!

charris commented Aug 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DimitriPapadopoulos commented Jul 4, 2024 •

edited

Loading

DimitriPapadopoulos Aug 27, 2024 •

edited

Loading

DimitriPapadopoulos Aug 27, 2024 •

edited

Loading

DimitriPapadopoulos Aug 27, 2024 •

edited

Loading

DimitriPapadopoulos Aug 27, 2024 •

edited

Loading