Tests: Make "Traceback did not match" an actual f-string

Otherwise the failure looks like this:

    >       assert (
                m is not None
            ), "Traceback did not match:\n\n{''.join(tb)}\nexpected:\n{expected_tb}"
    E       AssertionError: Traceback did not match:
    E
    E         {''.join(tb)}
    E         expected:
    E         {expected_tb}
    E       assert None is not None

Merge branch '3.0.x'

Merge pull request #1524 from pallets/update-requirements

update requirements

update requirements

Merge branch '3.0.x'

Merge pull request #1506 from pallets/release-3.0.2

release version 3.0.2

release version 3.0.2

Merge pull request #1505 from pallets/package-loader-path

omit curdir from PackageLoader root path

omit curdir from PackageLoader root path

fixes compatibility with zip imports

Co-authored-by: kuepe-sl <peter_kueffner@web.de>

Merge pull request #1495 from daniel-stoneuk/patch-async-globals

imported macros can access template globals in async mode

Merge branch '3.0.x'

Merge pull request #1504 from pallets/update-requirements

update requirements

apply pyupgrade

update pre-commit hooks

update requirements

Merge pull request #1503 from pallets/except-chain

use exception chaining

use exception chaining

fixes flake8-bugbear B904

Merge pull request #1501 from pallets/ignore-internal-warning

ignore internal asyncio warning

ignore internal asyncio warning

https://bugs.python.org/issue45097

Merge pull request #1492 from pallets/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v2.23.1 → v2.25.0](https://github.com/asottile/pyupgrade/compare/v2.23.1...v2.25.0)
- [github.com/psf/black: 21.7b0 → 21.8b0](https://github.com/psf/black/compare/21.7b0...21.8b0)

Merge pull request #1490 from pallets/dependabot/pip/tox-3.24.3

Bump tox from 3.24.1 to 3.24.3

Bump tox from 3.24.1 to 3.24.3

Bumps [tox](https://github.com/tox-dev/tox) from 3.24.1 to 3.24.3.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.24.1...3.24.3)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #1489 from pallets/dependabot/pip/pre-commit-2.14.1

Bump pre-commit from 2.13.0 to 2.14.1

Merge pull request #1491 from pallets/dependabot/pip/pytest-6.2.5

Bump pytest from 6.2.4 to 6.2.5

Bump pytest from 6.2.4 to 6.2.5

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.4 to 6.2.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.4...6.2.5)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump pre-commit from 2.13.0 to 2.14.1

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.13.0 to 2.14.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.13.0...v2.14.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

replace http with https in docs

Merge remote-tracking branch 'origin/3.0.x'

Merge pull request #1482 from esadek/pip_link

update pip link

update pip link

Merge pull request #1455 from ewjoachim/undefined-contains-1204

Only StrictUndefined.__contains__ raises error

Fixes #1448: Revert Undefined.__contains__ to 2.x behaviour

Merge pull request #1454 from atetubou/deterministic_test

make compile_templates deterministic

make compile_templates deterministic

Python3 doesn't keep insertion order for set(), so this sorts some
places for deterministic output for compiled template.

Merge pull request #1449 from amy-lei/loop-scoping

fix loop scoping bug

Merge pull request #1479 from pallets/dependabot/pip/tox-3.24.1

Bump tox from 3.23.1 to 3.24.1

Merge pull request #1480 from pallets/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v2.20.0 → v2.23.1](https://github.com/asottile/pyupgrade/compare/v2.20.0...v2.23.1)
- [github.com/asottile/reorder_python_imports: v2.5.0 → v2.6.0](https://github.com/asottile/reorder_python_imports/compare/v2.5.0...v2.6.0)
- [github.com/psf/black: 21.6b0 → 21.7b0](https://github.com/psf/black/compare/21.6b0...21.7b0)

Bump tox from 3.23.1 to 3.24.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.23.1 to 3.24.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.23.1...3.24.1)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #1472 from pallets/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v2.15.0 → v2.20.0](https://github.com/asottile/pyupgrade/compare/v2.15.0...v2.20.0)
- [github.com/psf/black: 21.5b1 → 21.6b0](https://github.com/psf/black/compare/21.5b1...21.6b0)
- [github.com/pre-commit/pre-commit-hooks: v3.4.0 → v4.0.1](https://github.com/pre-commit/pre-commit-hooks/compare/v3.4.0...v4.0.1)

Merge pull request #1469 from pallets/dependabot/pip/pip-tools-6.2.0

Bump pip-tools from 6.1.0 to 6.2.0

Bump pip-tools from 6.1.0 to 6.2.0

Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/jazzband/pip-tools/releases)
- [Changelog](https://github.com/jazzband/pip-tools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jazzband/pip-tools/compare/6.1.0...6.2.0)

---
updated-dependencies:
- dependency-name: pip-tools
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #1470 from pallets/dependabot/pip/mypy-0.910

Bump mypy from 0.812 to 0.910

Bump mypy from 0.812 to 0.910

Bumps [mypy](https://github.com/python/mypy) from 0.812 to 0.910.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.812...v0.910)

---
updated-dependencies:
- dependency-name: mypy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #1457 from pallets/dependabot/pip/pre-commit-2.13.0

Bump pre-commit from 2.12.1 to 2.13.0

Bump pre-commit from 2.12.1 to 2.13.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.12.1 to 2.13.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.12.1...v2.13.0)

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #1451 from greyli/improve-contributing-guide

Improve the contributing guide

Improve the contributing guide

clear assignments in loops at end of iteration

Merge branch '3.0.x'

Merge pull request #1447 from pallets/update-theme

Update theme

update pallets and sphinx requirements

update pallets-sphinx-themes

Merge branch '3.0.x'

start version 3.0.2.dev0

Merge pull request #1445 from pallets/release-3.0.1

release version 3.0.1

release version 3.0.1

Merge pull request #1444 from pallets/event-loop

use asyncio.run

use asyncio.run

Merge pull request #1442 from dannysepler/use-pathlib-in-places

Use pathlib in some test places

Use pathlib in some test places

Merge pull request #1440 from pallets/deprecated-markup

fix deprecated `Markup` subclass

Merge pull request #1439 from pallets/deprecated-markup

fix deprecated `Markup` subclass

fix deprecated `Markup` subclass

Merge branch '3.0.x'

Merge pull request #1436 from pallets/deprecated-extensions

fix context for deprecated extensions

show context for deprecated extensions

Merge pull request #1435 from pallets/update-typing

Update typing

Merge pull request #1434 from pallets/update-typing

Update typing

fix typing that wasn't available in Python 3.6.0

mark top-level names as exported

Merge remote-tracking branch 'origin/3.0.x'

Merge pull request #1420 from pallets/default-branch

rename default branch in files

rename default branch in files

Merge pull request #1419 from ThiefMaster/fix-sphinx-build

Install sphinx 4.1-dev from git

Remove type annotation breaking sphinx builds

Install sphinx 4.1-dev from git

Otherwise docs builds are broken due to sphinx-doc/sphinx#9216

Merge remote-tracking branch 'origin/3.0.x'

Merge pull request #1418 from pallets/update-markupsafe

update markupsafe minimum version

update markupsafe minimum version

start version 3.1.0.dev0

start version 3.0.1.dev0

Merge pull request #1417 from pallets/release-3.0.0

Release 3.0.0

release version 3.0.0

update requirements

Merge pull request #1416 from pallets/pre-commit-ci-schedule

update pre-commit monthly

update pre-commit monthly

Merge pull request #1415 from pallets/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v2.14.0 → v2.15.0](https://github.com/asottile/pyupgrade/compare/v2.14.0...v2.15.0)
- [github.com/psf/black: 21.4b2 → 21.5b1](https://github.com/psf/black/compare/21.4b2...21.5b1)
- [github.com/PyCQA/flake8: 3.9.1 → 3.9.2](https://github.com/PyCQA/flake8/compare/3.9.1...3.9.2)

Merge pull request #1414 from pallets/typing-marker

fix py.typed in manifest

fix py.typed in manifest

Merge pull request #1412 from pallets/typing

add type annotations

add type annotations

Merge pull request #1411 from pallets/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v2.13.0 → v2.14.0](https://github.com/asottile/pyupgrade/compare/v2.13.0...v2.14.0)
- [github.com/psf/black: 21.4b0 → 21.4b2](https://github.com/psf/black/compare/21.4b0...21.4b2)

Merge pull request #1410 from pallets/dependabot/pip/babel-2.9.1