Merge branch 'hotfix-6.0.2' into master

NEWS

@@ -1,10 +1,19 @@
 coming in the next release:
 
-6.0.1 - 15 September 2020
+6.0.2 - 25 October 2020
+    *   Stop building Python wheels with ``universal=1`` set. (#251)
+
+        This was causing pip to find and install the feedparser 6.x wheels
+        on Python 2 even though Python 2 is no longer supported.
+
+    *   Fix a bug that put a trailing quote in the documentation version. (#232)
+    *   Update the documentation URL to point to ReadTheDocs.
+
+6.0.1 - 15 September 2020 [YANKED]
     * Remove all Python 2 compatibility code (#228)
     * Add *python_requires* to ``setup.py`` (#231)
 
-6.0.0 - 12 September 2020
+6.0.0 - 12 September 2020 [YANKED]
     * Support Python 3.6, 3.7, 3.8 and 3.9
     * Drop support for Python 2.4 through 2.7, and Python 3.0 through 3.5 (#169)
     * Convert feedparser from a monolithic file to a package

README.rst

@@ -21,7 +21,7 @@ Documentation
 
 The feedparser documentation is available on the web at:
 
-    https://pythonhosted.org/feedparser/
+    https://feedparser.readthedocs.io/en/latest/
 
 It is also included in its source format, ReST, in the ``docs/`` directory.
 To build the documentation you'll need the Sphinx package, which is available at:

docs/conf.py

@@ -5,7 +5,7 @@
 
 
 content = (pathlib.Path(__file__).parent.parent / 'feedparser/__init__.py').read_text()
-match = re.search(r"""__version__ = ['"](?P<version>.+?['"])""", content)
+match = re.search(r"""__version__ = ['"](?P<version>.+?)['"]""", content)
 version = match.group('version')
 release = version
 

docs/index.rst

@@ -5,8 +5,8 @@ Documentation
 This documentation claims to describe the behavior of :program:`feedparser` |version|.
 It does not claim to describe the behavior of any other version.
 
-This documentation lives at `https://pythonhosted.org/feedparser/
-<https://pythonhosted.org/feedparser/>`_.  If you're reading it somewhere else, you may
+This documentation lives at `https://feedparser.readthedocs.io/en/latest/
+<https://feedparser.readthedocs.io/en/latest/>`_.  If you're reading it somewhere else, you may
 not have the latest version.
 
 This documentation is provided by the author "as is" without any express or

dodo.py

@@ -9,7 +9,7 @@
 import pathlib
 import random
 import subprocess
-import platform
+import webbrowser
 
 import colorama
 import docutils.core
@@ -70,15 +70,6 @@ def remove_dist_files():
         file.unlink()
 
 
-def open_browser(url):
-    """Open *url* in the default browser on Windows or Linux."""
-
-    if platform.system() == 'Windows':
-        subprocess.check_output(['start', url], shell=True)
-    elif platform.system() == 'Linux':
-        subprocess.check_output(['xdg-open', url], shell=True)
-
-
 def task_test_release():
     """Upload to test.pypi.org."""
 
@@ -95,7 +86,7 @@ def task_test_release():
             remove_dist_files,
             doit.action.CmdAction('python setup.py sdist bdist_wheel', env=env),
             f'twine upload --repository testpypi dist/*{env["NAME_SUFFIX"]}*',
-            (open_browser, [f'https://test.pypi.org/project/{PROJECT}_{env["NAME_SUFFIX"]}']),
+            (webbrowser.open, [f'https://test.pypi.org/project/{PROJECT}_{env["NAME_SUFFIX"]}']),
         ],
         'verbosity': 2,
     }
@@ -121,7 +112,7 @@ def task_release():
             remove_dist_files,
             'python setup.py sdist bdist_wheel',
             'twine upload dist/*',
-            (open_browser, [f'https://pypi.org/project/{PROJECT}']),
+            (webbrowser.open, [f'https://pypi.org/project/{PROJECT}']),
         ],
         'verbosity': 2,
     }

feedparser/__init__.py

@@ -32,7 +32,7 @@
 
 __author__ = 'Kurt McKee <contactme@kurtmckee.org>'
 __license__ = 'BSD 2-clause'
-__version__ = '6.0.1'
+__version__ = '6.0.2'
 
 # HTTP "User-Agent" header to send to servers when downloading feeds.
 # If you are embedding feedparser in a larger application, you should