Merge branch 'master' into gh-actions

* master:
  bump version for v21.0.1dev
  bump docs version, write v21.0.0 changelog
  bump version for v21.0.0 release (and add py3.9 classifier)
  [requires.io] dependency update

# Conflicts:
#	CHANGELOG.md

Author: wsanchez

CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * CPython 3.9 added to test matrix
 
+## 21.0.0
+
+*(January 7, 2021)*
+
+* Update plus sign (`+`) handling to work with/like HTML form encoding
+  (`POST`) by default, fixes [#129][i129], and associated roundtripping ([#146][i146]).
+* Package IDNA tables. ([#134][i134])
+* Long overdue dependency bumps
+
+[i129]: https://github.com/python-hyper/hyperlink/issues/129
+[i134]: https://github.com/python-hyper/hyperlink/issues/134
+[i146]: https://github.com/python-hyper/hyperlink/issues/146
+>>>>>>> master
+
 ## 20.0.1
 
 *(August 4, 2020)*

docs/conf.py

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

setup.py

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

tox.ini

@@ -318,7 +318,7 @@ description = build documentation
 basepython = {[default]basepython}
 
 deps =
-    Sphinx==3.4.2
+    Sphinx==3.4.3
     sphinx-rtd-theme==0.5.1
 
 commands =