Release 3.7.1

mborsetti · Jun 27, 2021 · 78c673f · 78c673f
1 parent 2e5fb78
commit 78c673f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.7.0
+current_version = 3.7.1
 message = Release {new_version}
 parse = ^
 	(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)

diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
@@ -6,7 +6,7 @@
 # Requires encrypted secret (see https://docs.github.com/en/actions/reference/encrypted-secrets) secrets.pypi_password
 
 
-name: Tests
+name: Test and deploy release
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
@@ -68,13 +68,9 @@ jobs:
 #        python-version: [3.9]
         include:
         - os: ubuntu-latest
-          pipcachepath: |
-            ~/.cache/pip
-#            #  /var/cache/apt/archives  # archives/lock & archives/partial: Cannot open: Permission denied
+          pipcachepath: ~/.cache/pip
         - os: macos-latest
-          pipcachepath: |
-            ~/Library/Caches/pip
-            ~/Library/Caches/Homebrew
+          pipcachepath: ~/Library/Caches/pip
 #        - os: windows-latest  # TODO windows-latest: pytest hanging / freezing on 27-Jun-21
 #                              # https://github.com/pytest-dev/pytest/discussions/6349
 #          pipcachepath: ~\AppData\Local\pip\cache

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -31,7 +31,7 @@ Unreleased documentation is `here <https://webchanges.readthedocs.io/en/unreleas
    Internals, for changes that don't affect users. [triggers a minor patch]
 
 
-Version 3.7.0
+Version 3.7.1
 ====================
 2021-06-27
 

diff --git a/tests/data/doc_filter_testdata.yaml b/tests/data/doc_filter_testdata.yaml
@@ -212,7 +212,7 @@ https://example.com/html2text.html:
     <body>
       <section role="main">
       <table>
-      <tr><th>Date</th><th>#Sales&trade</th></tr>
+      <tr><th>Date</th><th>#Sales&trade;</th></tr>
       <tr><td>Monday, 3 February 2020</td><td>10,000</td></tr>
       <tr><td>Tu, 3 Mar</td><td>20,000</td></tr>
       </table>
@@ -232,28 +232,28 @@ https://example.com/html2text_bs4.html:
     <body>
       <section role="main">
       <table>
-      <tr><th>Date</th><th>#Sales&trade</th></tr>
+      <tr><th>Date</th><th>#Sales&trade;</th></tr>
       <tr><td>Monday, 3 February 2020</td><td>10,000</td></tr>
       <tr><td>Tu, 3 Mar</td><td>20,000</td></tr>
       </table>
     </section>
     </body>
     </html>
-  output: Date#Sales&tradeMonday, 3 February 202010,000Tu, 3 Mar20,000
+  output: Date#Sales™Monday, 3 February 202010,000Tu, 3 Mar20,000
 https://example.com/html2text_strip_tags.html:
   input: |-
     <html>
     <body>
       <section role="main">
       <table>
-      <tr><th>Date</th><th>#Sales&trade</th></tr>
+      <tr><th>Date</th><th>#Sales&trade;</th></tr>
       <tr><td>Monday, 3 February 2020</td><td>10,000</td></tr>
       <tr><td>Tu, 3 Mar</td><td>20,000</td></tr>
       </table>
     </section>
     </body>
     </html>
-  output: "  Date#Sales&trade\n  Monday, 3 February 202010,000\n  Tu, 3 Mar20,000"
+  output: "  Date#Sales™\n  Monday, 3 February 202010,000\n  Tu, 3 Mar20,000"
 https://example.net/beautify.html:
   input: |
     <!DOCTYPE html>

diff --git a/webchanges/__init__.py b/webchanges/__init__.py
@@ -14,7 +14,7 @@
 # * MINOR version when you add functionality in a backwards compatible manner, and
 # * PATCH version when you make backwards compatible bug fixes
 # If unsure on increments, use pkg_resources.parse_version to parse
-__version__ = '3.7.0'
+__version__ = '3.7.1'
 __description__ = 'Check web (or commands) for changes since last run and notify'
 __author__ = 'Mike Borsetti <mike@borsetti.com>'
 __copyright__ = 'Copyright 2020- Mike Borsetti'

diff --git a/webchanges/filters.py b/webchanges/filters.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import hashlib
-import html
 import io
 import itertools
 import json
@@ -332,8 +331,6 @@ def filter(self, data: str, subfilter: Dict[str, Any]) -> str:  # type: ignore[o
             method = 'html2text'
         options = subfilter
 
-        data = html.unescape(data)
-
         if method in ('html2text', 'pyhtml2text'):  # pythtml2text for backward compatibility
             if method == 'pyhtml2text':
                 warnings.warn(