Merge pull request #6440 from LMFDB/main

main -> dev

Author: roed314

.github/workflows/autopep8.yml

@@ -5,46 +5,90 @@ on:
 jobs:
   autopep8:
     runs-on: ubuntu-latest
+    env:
+      # Error codes organized following https://pep8.readthedocs.io/en/latest/intro.html#error-codes
+      # 
+      # E1 - Indentation
+      # E111 - Fix indentation to be a multiple of four.
+      # E115 - Fix expected indented block (comment).
+      # 
+      # E2 - Whitespace  
+      # E211 - Remove extraneous whitespace before '('.
+      # E222 - Fix multiple spaces after operator.
+      # E225 - Fix missing whitespace around operator.
+      # E241 - Fix extraneous whitespace around keywords.
+      # E242 - Remove extraneous whitespace around operator.
+      # E251 - Remove whitespace around parameter '=' sign.
+      # E252 - Missing whitespace around parameter equals.
+      # E27 - Fix extraneous whitespace around keywords.
+      # 
+      # E3 - Blank line
+      # E303 - Remove extra blank lines.
+      # E304 - Remove blank line following function decorator.
+      # E306 - Expected 1 blank line before a nested definition.
+      # 
+      # E4 - Import
+      # E401 - Put imports on separate lines.
+      # 
+      # E5 - Line length
+      # E502 - Remove extraneous escape of newline.
+      # 
+      # E7 - Statement
+      # E70 - Put semicolon-separated compound statement on separate lines.
+      # E701 - Put colon-separated compound statement on separate lines.
+      # E702 - Put semicolon-separated compound statement on separate lines.
+      # E711 - Fix comparison with None.
+      # E712 - Fix comparison with boolean.
+      # E713 - Use 'not in' for test for membership.
+      # E714 - Use 'is not' test for object identity.
+      # E721 - Use "isinstance()" instead of comparing types directly.
+      # E731 - Use a def when use do not assign a lambda expression.
+      # 
+      # W2 - Whitespace warning
+      # W291 - Remove trailing whitespace.
+      # W292 - Add a single newline at the end of the file.
+      # W293 - Remove trailing whitespace on blank line.
+      # 
+      # W3 - Blank line warning
+      # W391 - Remove trailing blank lines.
+      # 
+      # W5 - Line break warning
+      # W504 - Fix line break after binary operator.
+      # 
+      # W6 - Deprecation warning
+      # W601 - Use "in" rather than "has_key()".
+      # W602 - Fix deprecated form of raising exception.
+      # W603 - Use "!=" instead of "<>"
+      # W604 - Use "repr()" instead of backticks.
+      # W605 - Fix invalid escape sequence 'x'.
+      # W690 - Fix various deprecated code (via lib2to3).
+      AUTOPEP8_CODES: |
+        E111,E115,
+        E211,E222,E225,E241,E242,E251,E252,E27,
+        E303,E304,E306,
+        E401,
+        E502,
+        E70,E701,E702,E711,E712,E713,E714,E721,E731,
+        W291,W292,W293,
+        W391,
+        W504,
+        W601,W602,W603,W604,W605,W690
     steps:
       - uses: actions/checkout@v2
         id: checkout
+      - name: Process autopep8 codes
+        id: process_codes
+        run: |
+          # Convert multiline codes to single line, removing newlines and extra spaces
+          PROCESSED_CODES=$(echo "$AUTOPEP8_CODES" | tr -d '\n' | tr -s ' ' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
+          echo "AUTOPEP8_SELECT=$PROCESSED_CODES" >> $GITHUB_ENV
+          echo "Processed codes: $PROCESSED_CODES"
       - name: autopep8
         uses: peter-evans/autopep8@v1
         if: ${{ github.repository }} == 'LMFDB/lmfdb'
         with:
-          # see generate_autopep8codes.py
-          # E241 - Fix extraneous whitespace around keywords.
-          # E242 - Remove extraneous whitespace around operator.
-          # E251 - Remove whitespace around parameter '=' sign.
-          # E252 - Missing whitespace around parameter equals.
-          # E27 -  Fix extraneous whitespace around keywords.
-          # E266 - Fix too many leading '#' for block comments.
-          # W291 - Remove trailing whitespace.
-          # W292 - Add a single newline at the end of the file.
-          # W293 - Remove trailing whitespace on blank line.
-          # E303 - Remove extra blank lines.
-          # E304 - Remove blank line following function decorator.
-          # E306 - Expected 1 blank line before a nested definition.
-          # W391 - Remove trailing blank lines.
-          # E401 - Put imports on separate lines.
-          # E502 - Remove extraneous escape of newline.
-          # W504 - Fix line break after binary operator.
-          # W601 - Use "in" rather than "has_key()".
-          # W602 - Fix deprecated form of raising exception.
-          # W603 - Use "!=" instead of "<>"
-          # W604 - Use "repr()" instead of backticks.
-          # W605 - Fix invalid escape sequence 'x'.
-          # W690 - Fix various deprecated code (via lib2to3).
-          # E70 -  Put semicolon-separated compound statement on separate lines.
-          # E701 - Put colon-separated compound statement on separate lines.
-          # E711 - Fix comparison with None.
-          # E712 - Fix comparison with boolean.
-          # E713 - Use 'not in' for test for membership.
-          # E714 - Use 'is not' test for object identity.
-          # E721 - Use "isinstance()" instead of comparing types directly.
-          # E722 - Fix bare except.
-          # E731 - Use a def when use do not assign a lambda expression.
-          args: --recursive --in-place --aggressive --select=E241,E242,E251,E252,E266,E27,W291,W292,W293,E303,E304,E306,W391,E401,E502,W504,W601,W602,W603,W604,W605,W690,E70,E701,E711,E712,E713,E714,E721,E722,E731 lmfdb/
+          # Args using processed environment variable
+          args: --recursive --in-place --aggressive --select=${{ env.AUTOPEP8_SELECT }} lmfdb/
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3

lmfdb/abvar/fq/isog_class.py

@@ -171,9 +171,7 @@ def newton_plot(self):
         L = Graphics()
         xmax = len(S)
         ymax = ZZ(len(S)/2)
-        pts.append((xmax,0))
-        L += polygon(pts,alpha=0.1)
-        pts.remove((xmax,0))
+        L += polygon(pts+[(0,ymax)],alpha=0.1)
         for i in range(xmax+1):
             L += line([(i, 0), (i, ymax)], color="grey", thickness=0.5)
         for j in range(ymax+1):

lmfdb/abvar/fq/main.py

@@ -538,7 +538,7 @@ def short_label(d):
 
     def search_types(self, info):
         return self._search_again(info, [
-            ('', 'List of isogeny classes'),
+            ('List', 'List of isogeny classes'),
             ('Counts', 'Counts table'),
             ('Random', 'Random isogeny class')])
 

lmfdb/api2/searchers.py

@@ -18,7 +18,7 @@ def get_info(self):
         return utils.get_filtered_fields(self._inv)
 
     def get_inventory(self):
-        if(self._full_inventory):
+        if (self._full_inventory):
             return self._full_inventory()
         return utils.get_filtered_fields(self._inv)
 
@@ -39,7 +39,7 @@ def auto_search(self, request):
         return self.get_search(sd, proj)
 
     def get_search(self, query, projection):
-        if(self._full_search):
+        if (self._full_search):
             return self._full_search(query, projection)
         return utils.simple_search(query, projection)
 
@@ -88,6 +88,5 @@ def register_singleton(url, table, key=None, simple_search=None, full_search=Non
     simple_search -- A function that modifies a query object to make it search for the requested object
     full_search -- A function that performs a search itself and returns the results
     """
-
     singletons[url] = {'table':table, 'key':key,
         'simple_search':simple_search, 'full_search':full_search}

lmfdb/belyi/test_belyi.py

@@ -154,7 +154,7 @@ def test_download(self):
             "/Belyi/download_galmap_to_sage/7T6-7_2.2.1.1.1_3.2.2-a",
             follow_redirects=True,
         )
-        assert(
+        assert (
             "phi = 1/2*(7*nu-15)*x^7/(x^7+1/10*(28*nu+7)*x^6+1/100*(-56*nu+511)*x^5+1/40*(-672*nu-1323)*x^4+1/20*(-42*nu-63)*x^3+1/40*(1701*nu+3024)*x^2+1/200*(-6237*nu-11178))"
             in page.get_data(as_text=True)
         )

lmfdb/characters/main.py

@@ -587,7 +587,7 @@ def _dir_knowl_data(label, orbit=False):
         parts = label.split('.')
         modulus = int(parts[0])
         if orbit:
-            assert(modulus <= ORBIT_MAX_MOD)
+            assert (modulus <= ORBIT_MAX_MOD)
             args = {'type': 'Dirichlet', 'modulus': modulus, 'orbit_label': parts[1]}
         else:
             number = int(parts[1])

lmfdb/classical_modular_forms/cmf_test_pages.py

@@ -75,7 +75,7 @@ def all_newspaces(self, level, weight):
         if dim is None:
             for ns in newspaces:
                 assert ns['dim'] == 0
-            assert not(newforms)
+            assert not (newforms)
             return []
 
         try:

lmfdb/ecnf/main.py

@@ -791,8 +791,8 @@ def __init__(self):
             )
 
         tor_opts = ([("", ""),
-                     ("[]", "trivial")] +
-                    [disp_tor(tuple(t)) for t in ECNF_stats().torsion_counts if t])
+                     ("[]", "trivial")]
+                    + [disp_tor(tuple(t)) for t in ECNF_stats().torsion_counts if t])
         torsion_structure = SelectBox(
             name="torsion_structure",
             label="Torsion structure",

lmfdb/elliptic_curves/elliptic_curve.py

@@ -20,7 +20,7 @@
     SearchArray, TextBox, SelectBox, SubsetBox, TextBoxWithSelect, CountBox, Downloader,
     StatsDisplay, parse_element_of, parse_signed_ints, search_wrap, redirect_no_cache, web_latex_factored_integer)
 from lmfdb.utils.interesting import interesting_knowls
-from lmfdb.utils.search_columns import SearchColumns, MathCol, LinkCol, ProcessedCol, MultiProcessedCol, CheckCol, FloatCol
+from lmfdb.utils.search_columns import SearchColumns, MathCol, LinkCol, ProcessedCol, MultiProcessedCol, CheckCol, FloatCol, ListCol
 from lmfdb.utils.common_regex import ZLLIST_RE
 from lmfdb.utils.web_display import dispZmat_from_list
 from lmfdb.api import datapage
@@ -470,7 +470,7 @@ def make_modcurve_link(label):
     ProcessedCol("equation", "ec.q.minimal_weierstrass_equation", "Weierstrass equation", latex_equation, short_title="Weierstrass equation", align="left", orig="ainvs", download_col="ainvs"),
     ProcessedCol("modm_images", "ec.galois_rep", r"mod-$m$ images", lambda v: "<span>" + ", ".join([make_modcurve_link(s) for s in v[:5]] + ([r"$\ldots$"] if len(v) > 5 else [])) + "</span>",
                   short_title="mod-m images", default=lambda info: info.get("galois_image")),
-    MathCol("mwgens", "ec.mordell_weil_group", "MW-generators", default=False),
+    ListCol("mwgens", "ec.mordell_weil_group", "MW-generators", mathmode=True, default=False),
 ])
 
 class ECDownloader(Downloader):

lmfdb/galois_groups/transitive_group.py

@@ -120,7 +120,7 @@ def order(self):
         return int(self._data['order'])
 
     def gens(self):
-        return(self._data['gens'])
+        return (self._data['gens'])
 
     def display_short(self, emptyifnotpretty=False):
         if self._data.get('pretty') is not None:
@@ -399,7 +399,7 @@ def group_phrase(n, t):
         inf += "A non-solvable"
     inf += ' group of order '
     inf += str(group['order'])
-    return(inf)
+    return (inf)
 
 
 @cached_function