diff options
| author | David Lord <davidism@gmail.com> | 2021-11-05 10:22:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 10:22:41 -0700 |
| commit | 7abfc64c3117c139ff4e430c590187067e8f3115 (patch) | |
| tree | eeb6cc20c80a8d38167eb6c72e8fffc4a75d4ebe | |
| parent | 00ada4ba3ad14e2ef7ca6fc4019cd51d3e47d07a (diff) | |
| parent | f4609e3345d3844d633313ddc4387ac9d6b9365e (diff) | |
| download | markupsafe-7abfc64c3117c139ff4e430c590187067e8f3115.tar.gz | |
Merge pull request #262 from pallets/drop-python-3.6
drop Python 3.6
| -rw-r--r-- | .github/workflows/tests.yaml | 1 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 2 | ||||
| -rw-r--r-- | CHANGES.rst | 1 | ||||
| -rw-r--r-- | setup.cfg | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4e48dd9..e6ef91f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -31,7 +31,6 @@ jobs: - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39} - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} - - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36} - {name: 'PyPy', python: 'pypy-3.7', os: ubuntu-latest, tox: pypy37} - {name: Typing, python: '3.10', os: ubuntu-latest, tox: typing} steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e4b8d0f..356b49c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: rev: v2.29.0 hooks: - id: pyupgrade - args: ["--py36-plus"] + args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports rev: v2.6.0 hooks: diff --git a/CHANGES.rst b/CHANGES.rst index 9c483ef..771c079 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,7 @@ Version 2.1.0 Unreleased +- Drop support for Python 3.6. :pr:`262` - Remove ``soft_unicode``, which was previously deprecated. Use ``soft_str`` instead. :pr:`261` - Raise error on missing single placeholder during string @@ -33,7 +33,7 @@ classifiers = packages = find: package_dir = = src include_package_data = true -python_requires = >= 3.6 +python_requires = >= 3.7 [options.packages.find] where = src @@ -75,7 +75,7 @@ max-line-length = 80 [mypy] files = src/markupsafe -python_version = 3.6 +python_version = 3.7 disallow_subclassing_any = True disallow_untyped_calls = True disallow_untyped_defs = True @@ -1,6 +1,6 @@ [tox] envlist = - py3{11,10,9,8,7,6},pypy37 + py3{11,10,9,8,7},pypy37 style typing docs |