Merge pull request #6385 from fchapoton/more_checks_in_lint

more checks and faster with ruff

Author: roed314

.github/workflows/python-package.yml

@@ -85,7 +85,7 @@ jobs:
       shell: bash -l {0}
       run: |
         sage -pip install -r requirements.txt
-        pip install pyflakes pylint pycodestyle
+        pip install pyflakes pylint pycodestyle ruff
 
     - name: checking that we didn't miss any test files
       shell: bash -l {0}

lmfdb/groups/abstract/test_abstract_groups.py

@@ -10,20 +10,21 @@ def test_is_solvable(self):
         self.check_args("/Groups/Abstract/60.5", "nonsolvable")
         self.check_args("/Groups/Abstract/32.51", "solvable")
 
-# To do:  Test a lot more data,  also more property box tests
+    # To do:  Test a lot more data,  also more property box tests
 
     def test_property_box(self):
         r"""
         Check that the property box displays.
         """
         page = self.tc.get("/Groups/Abstract/256.14916").get_data(as_text=True).replace("\n", "").replace(" ", "")
         assert r'<divclass="properties-body"><table><tr><tdclass="label">Label</td><td>256.14916</td></tr><tr>' in page
- #       assert r'<tdclass="label">Order</td><td>${2^{8}}$</td></tr>' in page
-       # self.check_args("/Variety/Abelian/Fq/2/79/ar_go", "Principally polarizable")
+        # assert r'<tdclass="label">Order</td><td>${2^{8}}$</td></tr>' in page
+        # self.check_args("/Variety/Abelian/Fq/2/79/ar_go", "Principally polarizable")
 
     def test_abstract_group_download(self):
-#        r"""
-#        Test downloading on search results page.
+        r"""
+        Test downloading on search results page.
+        """
         response = self.tc.get("/Groups/Abstract/384.5458/download/gap")
         self.assertTrue("If the group is solvable" in response.get_data(as_text=True))
         self.assertTrue("encd:= 293961739841108398509157889" in response.get_data(as_text=True))

lmfdb/groups/abstract/web_groups.py

@@ -140,13 +140,13 @@ def split_matrix_list_Fp(longList,d,e):
 
 
 def split_matrix_list_Fq(longList,d, Fqfld):
-# for gap definition of Fq
+    # for gap definition of Fq
     longList = [f"0*Z({Fqfld})" if x == -1 else f"Z({Fqfld})^{x}" for x in longList]  #-1 distinguishes 0 from z^0
     return str([longList[i:i+d] for i in range(0,d**2,d)]).replace("'", "")
 
 
 def split_matrix_Fq_add_al(longList,d):
-# for magma definition of Fq
+    # for magma definition of Fq
     longList = [0 if x == -1 else 1 if x == 0 else f"al^{x}" for x in longList]
     return str([longList[i:i+d] for i in range(0,d**2,d)]).replace("'", "")
 
@@ -662,8 +662,8 @@ def number_conjugacy_classes(self):
 
     @lazy_attribute
     def cc_known(self):
-#        if self.representations.get("Lie") and self.representations["Lie"][0]["family"][0] == "P" and self.order < 2000:
-#            return False   # problem with PGL, PSL, etc.
+        # if self.representations.get("Lie") and self.representations["Lie"][0]["family"][0] == "P" and self.order < 2000:
+        #     return False   # problem with PGL, PSL, etc.
         return db.gps_conj_classes.exists({'group_order': self.order, 'group_counter': self.counter})
 
     @lazy_attribute

lmfdb/local_fields/main.py

@@ -425,12 +425,12 @@ def render_field_webpage(args):
             galphrase = 'This field is'+isgal+abelian+r' over $\Q_{%d}.$' % p
             if the_gal.order() == gn:
                 auttype = 'gal'
-            info['aut_gp_knowl']= the_gal.aut_knowl()
+            info['aut_gp_knowl'] = the_gal.aut_knowl()
         # we don't know the Galois group, but maybe the Aut group is obvious
-        elif data['aut']==1:
-            info['aut_gp_knowl']=abstract_group_display_knowl('1.1')
+        elif data['aut'] == 1:
+            info['aut_gp_knowl'] = abstract_group_display_knowl('1.1')
         elif is_prime(data['aut']):
-            info['aut_gp_knowl']=abstract_group_display_knowl(f"{data['aut']}.1")
+            info['aut_gp_knowl'] = abstract_group_display_knowl(f"{data['aut']}.1")
         prop2 = [
             ('Label', label),
             ('Base', r'\(%s\)' % Qp),

lmfdb/number_fields/draw_spectrum.py

@@ -197,7 +197,7 @@ def unram_coords(frob_cycle_list, x_coord, y_centre, spread, col_max):
     point_index = 0         # total index of point
     for cyc_len, num_repeats in frob_cycle_list:
         for _ in range(num_repeats):
-            y_offset = round(spread*(2*point_index /(N-1) -1))
+            y_offset = round(spread * (2 * point_index / (N - 1) - 1))
             point = Point(x_coord, y_centre - y_offset, cyc_len)
             point_list.append(point)
             point_index += 1
@@ -213,13 +213,13 @@ def ram_coords(local_alg_dict, p, x_coord, y_centre, spread, deg=1):
     N = len(algs)
     assert algs != [], f"Ramified prime {p} has no local data!"
 
-    max_ram_index = max(e for e,_ in algs)
+    max_ram_index = max(e for e, _ in algs)
     point_list = []
 
     for i, alg in enumerate(algs):
         ram_index, residue_deg = alg
         if N != 1:
-            y_offset = round(spread*(2*i /(N-1) -1))
+            y_offset = round(spread * (2 * i / (N - 1) - 1))
         else:
             y_offset = 0
         point = Point(x_coord, y_centre - y_offset, residue_deg, hsl_color(ram_index, max_ram_index))
@@ -257,7 +257,7 @@ def test_drawspec(n=1, gaga=False):
     canvas = draw_spec(frobs, local_algs, True,
                        gaga=gaga,num_primes=num_primes)
     import tempfile
-    filename =  tempfile.gettempdir() + ('/gaga' if gaga else '/spec') + ".svg"
+    filename = tempfile.gettempdir() + ('/gaga' if gaga else '/spec') + ".svg"
     with open(filename, mode='w') as f:
         f.write(canvas.as_str())
 

tox.ini

@@ -20,15 +20,18 @@ commands =
 whitelist_externals =
     pyflakes
     pylint
-    # pycodestyle
+    ruff
 
 commands =
     pyflakes start-lmfdb.py	user-manager.py lmfdb/
     pylint --score=no -d C,R,E,W -e W0129,W0108 start-lmfdb.py user-manager.py lmfdb/
     # see https://pycodequ.al/docs/pylint-messages/Warnings.html
     # E111 indentation is not a multiple of four
+    # E115 Expected an indented block (comment)
     # E211 whitespace before '('
+    # E222 Multiple spaces after operator
+    # E225 Missing whitespace around operator
     # E702 multiple statements on one line (semicolon)
     # E711 Comparison to None should be 'cond is None:'
     # E722 do not use bare except, specify exception instead
-    pycodestyle --select=E111,E211,E702,E711,E722 lmfdb/
+    ruff check --preview --select=E111,E115,E211,E222,E225,E702,E711,E722 lmfdb/