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

.github/workflows/ci.yml

@@ -1,6 +1,33 @@
 name: CI
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9.16'
+          cache: 'pip' # caching pip dependencies
+      - run: python -m pip install pre-commit
+        shell: bash
+      - run: python -m pip freeze --local
+        shell: bash
+      - uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - run: pre-commit run --show-diff-on-failure --color=always --all-files
+        shell: bash
   test:
     runs-on: ubuntu-latest
     services:
@@ -16,10 +43,10 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+        uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.9.16
+          python-version: "3.9.16"
       - name: Cache Python dependencies
         uses: actions/cache@v2
         env:

.github/workflows/pre-commit-autoupdate.yml

@@ -0,0 +1,43 @@
+# Run pre-commit autoupdate every day at midnight
+# and create a pull request if any changes
+
+name: Pre-commit auto-update
+
+on:
+  schedule:
+    - cron: "15 2 * * *"
+  workflow_dispatch: # to trigger manually
+
+permissions:
+  contents: read
+
+jobs:
+  auto-update:
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'pythondotorg'
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.9.16"
+
+      - name: Install pre-commit
+        run: pip install pre-commit
+
+      - name: Autoupdate template
+        run: pre-commit autoupdate
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: update/pre-commit-autoupdate
+          title: Auto-update pre-commit hooks
+          commit-message: Auto-update pre-commit hooks
+          body: Update versions of tools in pre-commit configs to latest version
+          labels: update

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+repos:
+  - 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/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+      - id: pyupgrade
+        args: ['--py3-plus', '--py39-plus']
+  - repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
+    hooks:
+      - id: flake8
+        additional_dependencies: [
+            'flake8-bugbear==22.12.6',
+            'flake8-no-pep420==2.3.0'
+        ]

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

@@ -338,7 +338,7 @@ def validate_unique(self, exclude=None):
             qs = ReleaseFile.objects.filter(release=self.release, os=self.os, download_button=True).exclude(pk=self.id)
             if qs.count() > 0:
                 raise ValidationError("Only one Release File per OS can have \"Download button\" enabled")
-        super(ReleaseFile, self).validate_unique(exclude=exclude)
+        super().validate_unique(exclude=exclude)
 
     class Meta:
         verbose_name = 'Release File'

downloads/models.py

@@ -82,8 +82,8 @@ def test_is_version_at_least(self):
 
         release_38 = Release.objects.create(name='Python 3.8.0')
         self.assertFalse(release_38.is_version_at_least_3_9)
-        self.assert_(release_38.is_version_at_least_3_5)
+        self.assertTrue(release_38.is_version_at_least_3_5)
 
         release_310 = Release.objects.create(name='Python 3.10.0')
-        self.assert_(release_310.is_version_at_least_3_9)
-        self.assert_(release_310.is_version_at_least_3_5)
+        self.assertTrue(release_310.is_version_at_least_3_9)
+        self.assertTrue(release_310.is_version_at_least_3_5)