Merge branch 'master' into sphinx3

Author: glyph

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Hyperlink Changelog
 
-## dev (not yet released)
+## 20.0.1
+
+*(August 4, 2020)*
+
+Rerelease to fix packaging metadata around conditional requirements.
+See [issue #133](https://github.com/python-hyper/hyperlink/issues/133)
+for more details.
+
+## 20.0.0
+
+*(August 3, 2020)*
 
 * CPython 3.7 and 3.8 and PyPy3 added to test matrix
 * Hyperlink now has type hints and they are now exported per

README.md

@@ -6,7 +6,7 @@
     <img src="https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat" alt="Documentation">
 </a>
 <a href="https://pypi.org/project/hyperlink/">
-    <img src="https://img.shields.io/pypi/v/boltons.svg" alt="PyPI">
+    <img src="https://img.shields.io/pypi/v/hyperlink.svg" alt="PyPI">
 </a>
 <a href="http://calver.org">
     <img src="https://img.shields.io/badge/calver-YY.MINOR.MICRO-22bfda.svg" alt="Calendar Versioning">

docs/conf.py

@@ -64,8 +64,8 @@
 copyright = u'2018, Mahmoud Hashemi'
 author = u'Mahmoud Hashemi'
 
-version = '19.0'
-release = '19.0.0'
+version = '20.0'
+release = '20.0.1'
 
 if os.name != 'nt':
     today_fmt = '%B %d, %Y'

setup.py

@@ -11,7 +11,7 @@
 
 
 __author__ = "Mahmoud Hashemi and Glyph Lefkowitz"
-__version__ = "19.0.1dev"
+__version__ = "20.0.2dev"
 __contact__ = "mahmoud@hatnote.com"
 __url__ = "https://github.com/python-hyper/hyperlink"
 __license__ = "MIT"