summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump pytest from 6.2.4 to 6.2.5dependabot/pip/pytest-6.2.5dependabot[bot]2021-09-012-2/+2
| | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/3.0.x'David Lord2021-08-109-8/+61
|\
| * Merge pull request #1482 from esadek/pip_linkDavid Lord2021-08-101-1/+1
| |\ | | | | | | update pip link
| | * update pip linkEmil Sadek2021-08-101-1/+1
| |/
| * Merge pull request #1455 from ewjoachim/undefined-contains-1204David Lord2021-08-093-4/+6
| |\ | | | | | | Only StrictUndefined.__contains__ raises error
| | * Fixes #1448: Revert Undefined.__contains__ to 2.x behaviourJoachim Jablon2021-08-093-4/+6
| |/
| * Merge pull request #1454 from atetubou/deterministic_testDavid Lord2021-08-094-2/+32
| |\ | | | | | | make compile_templates deterministic
| | * make compile_templates deterministicTakuto Ikuta2021-08-094-2/+32
| |/ | | | | | | | | 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-scopingDavid Lord2021-08-093-0/+15
| |\ | | | | | | fix loop scoping bug
| | * clear assignments in loops at end of iterationAmy2021-05-213-0/+15
| | |
| * | Merge pull request #1451 from greyli/improve-contributing-guideDavid Lord2021-05-251-2/+8
| |\ \ | | |/ | |/| Improve the contributing guide
| | * Improve the contributing guideGrey Li2021-05-251-2/+8
| |/
* | Merge pull request #1479 from pallets/dependabot/pip/tox-3.24.1David Lord2021-08-031-1/+1
|\ \ | | | | | | Bump tox from 3.23.1 to 3.24.1
| * | Bump tox from 3.23.1 to 3.24.1dependabot[bot]2021-08-011-1/+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 #1480 from pallets/pre-commit-ci-update-configDavid Lord2021-08-032-4/+4
|\ \ \ | |/ / |/| | [pre-commit.ci] pre-commit autoupdate
| * | [pre-commit.ci] auto fixes from pre-commit.com hookspre-commit-ci[bot]2021-08-021-1/+1
| | | | | | | | | | | | for more information, see https://pre-commit.ci
| * | [pre-commit.ci] pre-commit autoupdatepre-commit-ci[bot]2021-08-021-3/+3
|/ / | | | | | | | | | | | | 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)
* | Merge pull request #1472 from pallets/pre-commit-ci-update-configDavid Lord2021-07-061-3/+3
|\ \ | | | | | | [pre-commit.ci] pre-commit autoupdate
| * | [pre-commit.ci] pre-commit autoupdatepre-commit-ci[bot]2021-07-051-3/+3
|/ / | | | | | | | | | | | | 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.0David Lord2021-07-011-1/+3
|\ \ | | | | | | Bump pip-tools from 6.1.0 to 6.2.0
| * | Bump pip-tools from 6.1.0 to 6.2.0dependabot[bot]2021-07-011-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.910David Lord2021-07-012-9/+8
|\ \ | | | | | | Bump mypy from 0.812 to 0.910
| * | Bump mypy from 0.812 to 0.910dependabot[bot]2021-07-012-9/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 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.0David Lord2021-06-011-1/+1
|\ \ | | | | | | Bump pre-commit from 2.12.1 to 2.13.0
| * | Bump pre-commit from 2.12.1 to 2.13.0dependabot[bot]2021-06-011-1/+1
|/ / | | | | | | | | | | | | | | 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 branch '3.0.x'David Lord2021-05-204-14/+14
|\ \ | |/
| * Merge pull request #1447 from pallets/update-themeDavid Lord2021-05-204-14/+14
| |\ | | | | | | Update theme
| | * update pallets and sphinx requirementsDavid Lord2021-05-203-9/+9
| | |
| | * update pallets-sphinx-themesDavid Lord2021-05-203-5/+5
| |/
* | Merge branch '3.0.x'David Lord2021-05-188-62/+79
|\ \ | |/
| * start version 3.0.2.dev0David Lord2021-05-182-1/+7
| |
| * Merge pull request #1445 from pallets/release-3.0.13.0.1David Lord2021-05-182-2/+2
| |\ | | | | | | release version 3.0.1
| | * release version 3.0.1David Lord2021-05-182-2/+2
| |/
| * Merge pull request #1444 from pallets/event-loopDavid Lord2021-05-184-15/+45
| |\ | | | | | | use asyncio.run
| | * use asyncio.runDavid Lord2021-05-184-15/+45
| |/
| * Merge pull request #1442 from dannysepler/use-pathlib-in-placesDavid Lord2021-05-184-46/+27
| |\ | | | | | | Use pathlib in some test places
| | * Use pathlib in some test placesDanny Sepler2021-05-184-46/+27
| |/
| * Merge pull request #1440 from pallets/deprecated-markupDavid Lord2021-05-172-1/+3
| |\ | | | | | | fix deprecated `Markup` subclass
* | \ Merge pull request #1439 from pallets/deprecated-markupDavid Lord2021-05-172-1/+3
|\ \ \ | | |/ | |/| fix deprecated `Markup` subclass
| * | fix deprecated `Markup` subclassDavid Lord2021-05-172-1/+3
| |/
* | Merge branch '3.0.x'David Lord2021-05-132-2/+4
|\ \ | |/
| * Merge pull request #1436 from pallets/deprecated-extensionsDavid Lord2021-05-132-2/+4
| |\ | | | | | | fix context for deprecated extensions
| | * show context for deprecated extensionsDavid Lord2021-05-132-2/+4
| |/
| * Merge pull request #1435 from pallets/update-typingDavid Lord2021-05-1310-45/+58
| |\ | | | | | | Update typing
* | \ Merge pull request #1434 from pallets/update-typingDavid Lord2021-05-1310-45/+58
|\ \ \ | | |/ | |/| Update typing
| * | fix typing that wasn't available in Python 3.6.0David Lord2021-05-139-13/+24
| | |
| * | mark top-level names as exportedDavid Lord2021-05-132-32/+34
| |/
* | Merge remote-tracking branch 'origin/3.0.x'David Lord2021-05-1111-70/+69
|\ \ | |/
| * Merge pull request #1420 from pallets/default-branchDavid Lord2021-05-117-56/+59
| |\ | | | | | | rename default branch in files
| | * rename default branch in filesDavid Lord2021-05-117-56/+59
| |/