wip

Author: luzfcb

.bandit.yaml

@@ -0,0 +1,10 @@
+exclude_dirs:
+    - /tests/
+    - ./venv/
+    - ./env/
+    - ./node_modules/
+    - .tox
+    - pydotorg/settings/local.py
+skips:
+    - B101  # B101: assert
+    - B311  # B311: random

.flake8

@@ -0,0 +1,13 @@
+[flake8]
+max-line-length = 120
+ignore =
+    D100,D101,D102,D103,D105,D205,D400,
+    E305,E266,E231
+    W504,W606,X100
+exclude = ./node_modules/*,*/migrations/*,./venv/*,./env/*,./_personal/*,.tox/*
+per-file-ignores =
+    manage.py:INP001
+    docs/source/conf.py:INP001
+    */test_*.py: E501,W605
+    custom_storages/__init__.py:F401
+    sponsors/models/__init__.py:F401

.pre-commit-config.yaml

@@ -0,0 +1,72 @@
+repos:
+#  - repo: https://github.com/pre-commit/pre-commit-hooks
+#    rev: v4.3.0
+#    hooks:
+#      - id: fix-byte-order-marker
+#      - id: check-case-conflict
+#      - id: check-merge-conflict
+#      - id: check-symlinks
+#      - id: debug-statements
+#      - id: detect-private-key
+#      - id: double-quote-string-fixer
+#      - id: end-of-file-fixer
+#        types: [python]
+#      - id: mixed-line-ending
+#      - id: no-commit-to-branch
+#        args: [--branch, main, --branch, master]
+  - repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: 'v2.0.0'
+    hooks:
+      - id: autopep8
+        args: ['--in-place', '--select', 'E101,E112,E113,E115,E116,E117,E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E133,E201,E202,E203,E211,E221,E222,E223,E224,E225,E226,E227,E228,E231,E231,E241,E242,E251,E252,E261,E262,E265,E271,E272,E273,E274,E275,E301,E302,E303,E304,E305,E306,W391']
+  - repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
+    hooks:
+      - id: flake8
+        additional_dependencies: [
+            'flake8-bugbear==22.10.27',
+            'flake8-no-pep420==2.3.0'
+        ]
+#  - repo: https://github.com/PyCQA/bandit
+#    rev: 1.7.4
+#    hooks:
+#      - id: bandit
+#        args: ['-c', '.bandit.yaml', '--silent']
+  - repo: https://github.com/browniebroke/django-codemod
+    # django-codemod is a tool to automatically
+    # fix Django deprecations.
+    # Any tag/version (>=1.5.7):
+    # https://github.com/browniebroke/django-codemod/tags
+    #
+    # Automatic execution of this hook has been disabled
+    # because it is a bit slow, but its configuration is
+    # kept here, so it can be easily run:
+    #
+    # pre-commit run --hook-stage manual djcodemod
+    # or
+    # pre-commit run -a --hook-stage manual djcodemod
+    rev: v1.11.0
+    hooks:
+      - id: djcodemod
+        stages: [manual]
+        args: [
+            'run',
+            '--deprecated-in', '1.9',
+            '--deprecated-in', '1.10',
+            '--deprecated-in', '1.11',
+            '--deprecated-in', '2.0',
+            '--deprecated-in', '2.1',
+            '--deprecated-in', '2.2',
+            '--deprecated-in', '3.0',
+            '--deprecated-in', '3.1',
+        ]
+#  - repo: https://github.com/adamchainz/django-upgrade
+#    rev: '1.11.0'  # replace with latest tag on GitHub
+#    hooks:
+#      - id: django-upgrade
+#        args: [--target-version, '4.1']   # Replace with Django version
+#  - repo: https://github.com/asottile/pyupgrade
+#    rev: v3.2.0
+#    hooks:
+#      - id: pyupgrade
+#        args: ['--py3-plus', '--py39-plus']

boxes/templatetags/__init__.py

@@ -44,7 +44,7 @@ def get_fieldsets(self, request, obj=None):
         # Remove created/updated/creator from any existing fieldsets. They'll
         # be there if the child class didn't manually declare fieldsets.
         fieldsets = super().get_fieldsets(request, obj)
-        for name, fieldset in fieldsets:
+        for __, fieldset in fieldsets:
             for f in ('created', 'updated', 'creator', 'last_modified_by'):
                 if f in fieldset['fields']:
                     fieldset['fields'].remove(f)

cms/admin.py

@@ -14,3 +14,5 @@ django-debug-toolbar==3.2.1
 coverage
 ddt
 model-bakery==1.4.0
+flake8
+pre-commit

dev-requirements.txt

@@ -366,6 +366,7 @@ def test_job_preview_404(self):
         self.assertEqual(response.status_code, 404)
 
     def test_job_create_prepopulate_email(self):
+        # TODO: Refactor
         create_url = reverse('jobs:job_create')
         user_data = {
             'username': 'phrasebook',
@@ -374,12 +375,12 @@ def test_job_create_prepopulate_email(self):
         }
 
         User = get_user_model()
-        creator = User.objects.create_user(**user_data)
+        User.objects.create_user(**user_data)
 
         # Logged in, email address is prepopulated.
         self.client.login(username=user_data['username'],
                           password=user_data['password'])
-        response = self.client.get(create_url)
+        self.client.get(create_url)
 
     def test_job_types(self):
         job_type2 = JobTypeFactory(

jobs/tests/test_views.py

@@ -32,9 +32,9 @@ def __str__(self):
     def nominations_open(self):
         if self.nominations_open_at and self.nominations_close_at:
             return (
-                self.nominations_open_at
-                < datetime.datetime.now(datetime.timezone.utc)
-                < self.nominations_close_at
+                self.nominations_open_at <
+                datetime.datetime.now(datetime.timezone.utc) <
+                self.nominations_close_at
             )
 
         return False
@@ -128,8 +128,8 @@ def display_name(self):
     @property
     def display_previous_board_service(self):
         if (
-            self.self_nomination is not None
-            and self.self_nomination.previous_board_service
+            self.self_nomination is not None and
+            self.self_nomination.previous_board_service
         ):
             return self.self_nomination.previous_board_service
 
@@ -215,16 +215,16 @@ def get_accept_url(self):
 
     def editable(self, user=None):
         if (
-            self.nominee
-            and user == self.nominee.user
-            and self.election.nominations_open
+            self.nominee and
+            user == self.nominee.user and
+            self.election.nominations_open
         ):
             return True
 
         if (
-            user == self.nominator
-            and not (self.accepted or self.approved)
-            and self.election.nominations_open
+            user == self.nominator and
+            not (self.accepted or self.approved) and
+            self.election.nominations_open
         ):
             return True
 

nominations/models.py

@@ -51,7 +51,7 @@ def copy_image(self, content_path, image):
             pass
         try:
             shutil.copyfile(src, dst)
-        except Exception as e:
+        except Exception:  # noqa
             pass
 
     def save_images(self, content_path, page):
@@ -79,7 +79,7 @@ def handle(self, *args, **kwargs):
             raise ImproperlyConfigured("PYTHON_ORG_CONTENT_SVN_PATH not defined in settings")
 
         matches = []
-        for root, dirnames, filenames in os.walk(self.SVN_REPO_PATH):
+        for root, __dirnames, filenames in os.walk(self.SVN_REPO_PATH):
             for filename in filenames:
                 if re.match(r'(content\.(ht|rst)|body\.html)$', filename):
                     matches.append(os.path.join(root, filename))
@@ -93,7 +93,7 @@ def handle(self, *args, **kwargs):
 
             try:
                 data = parse_page(os.path.dirname(match))
-            except Exception as e:
+            except Exception:  # noqa
                 print(f"Unable to parse {match}")
                 traceback.print_exc()
                 continue
@@ -109,7 +109,7 @@ def handle(self, *args, **kwargs):
 
                 page_obj, _ = Page.objects.get_or_create(path=path, defaults=defaults)
                 self.save_images(path, page_obj)
-            except Exception as e:
+            except Exception:  # noqa
                 print(f"Unable to create Page object for {match}")
                 traceback.print_exc()
                 continue

pages/management/commands/import_pages_from_svn.py

@@ -12,7 +12,10 @@
 )
 
 PEP_TEMPLATE = 'pages/pep-page.html'
-pep_url = lambda num: f'dev/peps/pep-{num}/'
+
+
+def pep_url(num):
+    return f'dev/peps/pep-{num}/'
 
 
 def get_peps_last_updated():