diff options
| author | David Lord <davidism@gmail.com> | 2021-05-18 10:19:51 -0700 |
|---|---|---|
| committer | David Lord <davidism@gmail.com> | 2021-05-18 10:19:51 -0700 |
| commit | 78c1fbfbce55ba09e72753ae3e768bdbcc487e8b (patch) | |
| tree | 0842d3d76c82fd58bbc2898ef18ddad333ce4ce0 | |
| parent | a4dae9c70f27f88f3817569ee5bcf81a5b1f6113 (diff) | |
| parent | 5faff6a29460d73c022c825c2ee31899733f6b4c (diff) | |
| download | markupsafe-78c1fbfbce55ba09e72753ae3e768bdbcc487e8b.tar.gz | |
Merge branch '2.0.x'
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | CHANGES.rst | 12 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | src/markupsafe/__init__.py | 15 |
4 files changed, 22 insertions, 11 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5efae06..b5527c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,9 +21,9 @@ jobs: uses: docker/setup-qemu-action@v1 with: platforms: arm64 - - uses: joerick/cibuildwheel@v1.9.0 + - uses: joerick/cibuildwheel@v1.11.0 env: - CIBW_SKIP: 'cp27-* cp35-* pp*' + CIBW_SKIP: 'pp*' CIBW_ARCHS_LINUX: auto aarch64 CIBW_ARCHS_MACOS: auto universal2 - uses: actions/upload-artifact@v2 diff --git a/CHANGES.rst b/CHANGES.rst index 1632f62..9d19bc8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,12 +4,22 @@ Version 2.1.0 Unreleased -Version 2.0.1 +Version 2.0.2 ------------- Unreleased +Version 2.0.1 +------------- + +Released 2021-05-18 + +- Mark top-level names as exported so type checking understands + imports in user projects. :pr:`215` +- Fix some types that weren't available in Python 3.6.0. :pr:`215` + + Version 2.0.0 ------------- @@ -82,7 +82,7 @@ disallow_untyped_defs = True disallow_incomplete_defs = True no_implicit_optional = True local_partial_types = True -# no_implicit_reexport = True +no_implicit_reexport = True strict_equality = True warn_redundant_casts = True warn_unused_configs = True diff --git a/src/markupsafe/__init__.py b/src/markupsafe/__init__.py index 733e078..048ddb8 100644 --- a/src/markupsafe/__init__.py +++ b/src/markupsafe/__init__.py @@ -4,8 +4,9 @@ import string import typing as t if t.TYPE_CHECKING: + import typing_extensions as te - class HasHTML(t.Protocol): + class HasHTML(te.Protocol): def __html__(self) -> str: pass @@ -276,12 +277,12 @@ class _MarkupEscapeHelper: # circular import try: - from ._speedups import escape - from ._speedups import escape_silent - from ._speedups import soft_str + from ._speedups import escape as escape + from ._speedups import escape_silent as escape_silent + from ._speedups import soft_str as soft_str from ._speedups import soft_unicode except ImportError: - from ._native import escape - from ._native import escape_silent # noqa: F401 - from ._native import soft_str # noqa: F401 + from ._native import escape as escape + from ._native import escape_silent as escape_silent # noqa: F401 + from ._native import soft_str as soft_str # noqa: F401 from ._native import soft_unicode # noqa: F401 |