diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1ee3c6..faff9b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,11 @@ jobs: - "pydocstyle ." runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.1 - uses: actions/checkout@v2.4.0 - - uses: actions/cache@v2.1.6 with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + cache: 'pip' + cache-dependency-path: 'requirements.txt' - run: python -m pip install -r requirements.txt - run: ${{ matrix.lint-command }} @@ -35,8 +32,10 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt install -y gettext - - uses: actions/setup-python@v2.2.2 - - uses: actions/setup-node@v2.4.1 + - uses: actions/setup-python@v2.3.1 + - uses: actions/setup-node@v2.5.1 + with: + node-version: 'lts/*' - uses: actions/checkout@v2.4.0 - name: Install Python dependencies run: python -m pip install --upgrade pip setuptools wheel twine readme-renderer @@ -49,8 +48,11 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.3.1 - uses: actions/checkout@v2.4.0 + with: + cache: 'pip' + cache-dependency-path: 'requirements.txt' - run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r requirements.txt - run: python setup.py develop @@ -67,7 +69,7 @@ jobs: - "3.10" steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel @@ -88,7 +90,7 @@ jobs: python-version: ["3.10"] steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel @@ -122,7 +124,7 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7217ce9..ffad020 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.3.1 - name: Install Python dependencies run: python -m pip install --upgrade pip setuptools wheel twine - name: Build dist packages diff --git a/mailauth/forms.py b/mailauth/forms.py index ecdb9b6..d20533f 100644 --- a/mailauth/forms.py +++ b/mailauth/forms.py @@ -42,7 +42,7 @@ def get_token(self, user): """Return the access token.""" return MailAuthBackend.get_token(user=user) - def get_context(self, request, user): + def get_mail_context(self, request, user): """ Return the context for a message template render. @@ -118,7 +118,7 @@ def save(self): """ email = self.cleaned_data[self.field_name] for user in self.get_users(email): - context = self.get_context(self.request, user) + context = self.get_mail_context(self.request, user) self.send_mail(email, context) def send_mail(self, to_email, context): diff --git a/requirements.txt b/requirements.txt index 7acae09..d296f6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Django>=2.2 Wagtail>=2.8 -bandit==1.7.0 -black==21.10b0 +bandit==1.7.1 +black==21.12b0 flake8==4.0.1 isort==5.10.1 msgcheck==3.1